Replace suitable equalsAscii calls with equalsAsciiL.

Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
author: Thomas Arnhold <thomas@arnhold.org> 2011-01-20 10:33:13 +0100
committer: Thomas Arnhold <thomas@arnhold.org> 2011-01-20 11:31:12 +0100
commit: 4dd5c0b6b7b0df2b469635c96bc22fc2076f1997 (patch)
tree: f5143663aea7c9fbbb5567887d9c0ff594316ae0
parent: d870d4fa5d7179b05286f26ac9361074730f89e2 (diff)
42 files changed, 257 insertions, 257 deletions
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 155bb5e79fc2..e88c0c296d0b 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -351,43 +351,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
 
 #define COMP_HACK
 #ifdef COMP_HACK
-    if (sDocumentService.equalsAscii("writer"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("web"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("web")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("global"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("global")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("calc"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("calc")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("draw"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("draw")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("impress"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("impress")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
     }
     else
-    if (sDocumentService.equalsAscii("math"))
+    if (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("math")))
     {
         OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
         sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index 5c022a0a0b41..4f4e3ae513b1 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -83,8 +83,8 @@ void SAL_CALL LateInitListener::notifyEvent(const css::document::EventObject& aE
 {
     // wait for events, which indicates finished open of the first document
     if (
-        (aEvent.EventName.equalsAscii("OnNew") ) ||
-        (aEvent.EventName.equalsAscii("OnLoad"))
+        (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnNew")) ) ||
+        (aEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnLoad")))
        )
     {
         // this thread must be started one times only ...
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index 87ea95cba4d8..a766e343a4f8 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -259,10 +259,10 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
             // But then we loose automatic opening of CSV files in calc instead of opening these files
             // inside writer.
             if (
-                (sDocumentService.equalsAscii("com.sun.star.sheet.SpreadsheetDocument")) &&
+                (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument"))) &&
                 (
                     (sRealType.equalsAscii("writer_Text"        )) ||
-                    (sRealType.equalsAscii("writer_Text_encoded"))
+                    (sRealType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("writer_Text_encoded")))
                 )
                )
             {
@@ -270,7 +270,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
             }
             else
             if (
-                (sDocumentService.equalsAscii("com.sun.star.text.TextDocument")) &&
+                (sDocumentService.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))) &&
                 (sRealType.equalsAscii("calc_Text_txt_csv_StarCalc"           ))
                )
             {
diff --git a/filter/source/filtertracer/filtertracer.cxx b/filter/source/filtertracer/filtertracer.cxx
index eb6ac53edfef..f5536407e143 100644
--- a/filter/source/filtertracer/filtertracer.cxx
+++ b/filter/source/filtertracer/filtertracer.cxx
@@ -118,19 +118,19 @@ void SAL_CALL FilterTracer::initialize( const SEQ( NMSP_UNO::Any )& aArguments )
     for ( i = 0; i < aParameter.getLength(); i++ )
     {
         const NMSP_BEANS::PropertyValue& rProp = aParameter[ i ];
-        if ( rProp.Name.equalsAscii( "LogLevel" ) )
+        if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "LogLevel" ) ) )
             rProp.Value >>= mnLogLevel;
-        else if ( rProp.Name.equalsAscii( "ClassFilter" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClassFilter" ) ) )
             rProp.Value >>= msClassFilter;
-        else if ( rProp.Name.equalsAscii( "MethodFilter" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MethodFilter" ) ) )
             rProp.Value >>= msMethodFilter;
-        else if ( rProp.Name.equalsAscii( "MessageFilter" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MessageFilter" ) ) )
             rProp.Value >>= msMessageFilter;
-        else if ( rProp.Name.equalsAscii( "OutputStream" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
             rProp.Value >>= mxOutputStream;
-        else if ( rProp.Name.equalsAscii( "URL" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) )
             rProp.Value >>= msURL;
-        else if ( rProp.Name.equalsAscii( "DocumentHandler" ) )
+        else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentHandler" ) ) )
             rProp.Value >>= mxDocumentHandler;
     }
 
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index 292c22eed4ae..6520341f60e9 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -245,7 +245,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
 
     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;
     }
 
@@ -267,7 +267,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
 
     for( sal_Int32 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 >>= maFilterData;
             break;
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index ecfa6e4a01b0..062c5e52e606 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -783,33 +783,33 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
                     /* todo:
                     calculate the best option for ArrowLenght and ArrowWidth
                     */
-                    if ( aApiName.equalsAscii( "Arrow concave" ) )
+                    if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow concave" ) ) )
                         reLineEnd = ESCHER_LineArrowStealthEnd;
-                    else if ( aApiName.equalsAscii( "Square 45" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square 45" ) ) )
                         reLineEnd = ESCHER_LineArrowDiamondEnd;
-                    else if ( aApiName.equalsAscii( "Small Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Small Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
-                    else if ( aApiName.equalsAscii( "Dimension Lines" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Dimension Lines" ) ) )
                     {
                         rnArrowLength = 0;
                         rnArrowWidth  = 2;
                         reLineEnd = ESCHER_LineArrowOvalEnd;
                     }
-                    else if ( aApiName.equalsAscii( "Double Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Double Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
-                    else if ( aApiName.equalsAscii( "Rounded short Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded short Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
-                    else if ( aApiName.equalsAscii( "Symmetric Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Symmetric Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
-                    else if ( aApiName.equalsAscii( "Line Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Line Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowOpenEnd;
-                    else if ( aApiName.equalsAscii( "Rounded large Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Rounded large Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
-                    else if ( aApiName.equalsAscii( "Circle" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Circle" ) ) )
                         reLineEnd = ESCHER_LineArrowOvalEnd;
-                    else if ( aApiName.equalsAscii( "Square" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Square" ) ) )
                         reLineEnd = ESCHER_LineArrowDiamondEnd;
-                    else if ( aApiName.equalsAscii( "Arrow" ) )
+                    else if ( aApiName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Arrow" ) ) )
                         reLineEnd = ESCHER_LineArrowEnd;
                 }
                 else if ( aArrowStartName.GetTokenCount( ' ' ) == 2 )
@@ -3324,18 +3324,18 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
                 for ( i = 0; i < nCount; i++ )
                 {
                     const beans::PropertyValue& rProp = aGeoPropSeq[ i ];
-                    if ( rProp.Name.equalsAscii( "Type" ) )
+                    if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
                     {
                         if ( rProp.Value >>= rShapeType )
                             eShapeType = EnhancedCustomShapeTypeNames::Get( rShapeType );
                     }
-                    else if ( rProp.Name.equalsAscii( "MirroredX" ) )
+                    else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredX" ) ) )
                     {
                         sal_Bool bMirroredX = sal_Bool();
                         if ( ( rProp.Value >>= bMirroredX ) && bMirroredX )
                             nMirrorFlags  |= SHAPEFLAG_FLIPH;
                     }
-                    else if ( rProp.Name.equalsAscii( "MirroredY" ) )
+                    else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MirroredY" ) ) )
                     {
                         sal_Bool bMirroredY = sal_Bool();
                         if ( ( rProp.Value >>= bMirroredY ) && bMirroredY )
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index f7608830e72b..4e4167e2d0c6 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -266,7 +266,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
 
             rtl::OUString sCustomShapeType;
             MSO_SPT eShapeType = aPropOpt.GetCustomShapeType( rObj.GetShapeRef(), 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" ) ) )
             {
                 ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
                 if ( aPropOpt.CreateGraphicProperties( rObj.mXPropSet, String( RTL_CONSTASCII_USTRINGPARAM( "MetaFile" ) ), sal_False ) )
diff --git a/filter/source/odfflatxml/FlatXml.cxx b/filter/source/odfflatxml/FlatXml.cxx
index f6d7543df9e4..6bf7c608a440 100644
--- a/filter/source/odfflatxml/FlatXml.cxx
+++ b/filter/source/odfflatxml/FlatXml.cxx
@@ -91,11 +91,11 @@ namespace XFlatXml
         for (sal_Int32 i = 0; i < nLength; i++)
             {
                 aName = aSourceData[i].Name;
-                if (aName.equalsAscii("InputStream"))
+                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
                     aSourceData[i].Value >>= xInputStream;
-                else if (aName.equalsAscii("FileName"))
+                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
                     aSourceData[i].Value >>= aFileName;
-                else if (aName.equalsAscii("URL"))
+                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
                     aSourceData[i].Value >>= aURL;
             }
 
@@ -159,9 +159,9 @@ namespace XFlatXml
         for (sal_Int32 i = 0; i < nLength; i++)
             {
                 aName = aSourceData[i].Name;
-                if (aName.equalsAscii("OutputStream"))
+                if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
                     aSourceData[i].Value >>= rOutputStream;
-                else if (aName.equalsAscii("URL"))
+                else if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
                     aSourceData[i].Value >>= sURL;
             }
 
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 5ea265834f47..940e057c0b8e 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -184,7 +184,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
 
     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;
     }
 
@@ -206,7 +206,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
 
     for( sal_Int32 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 >>= maFilterData;
             break;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 5675b4361db8..494e3c1c3235 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -338,7 +338,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                         Sequence< beans::PropertyValue > aFilterData;
                         xFilterFactory->getByName( aFilterName ) >>= aFilterData;
                         for ( sal_Int32 nInd = 0; nInd < aFilterData.getLength(); nInd++ )
-                            if ( aFilterData[nInd].Name.equalsAscii( "Type" ) )
+                            if ( aFilterData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
                                 aFilterData[nInd].Value >>= aTypeName;
 
                         if ( aTypeName.getLength() )
@@ -351,7 +351,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
                             Sequence< beans::PropertyValue > aTypeData;
                             xTypeDetection->getByName( aTypeName ) >>= aTypeData;
                             for ( sal_Int32 nInd = 0; nInd < aTypeData.getLength(); nInd++ )
-                                if ( aTypeData[nInd].Name.equalsAscii( "MediaType" ) )
+                                if ( aTypeData[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
                                     aTypeData[nInd].Value >>= aDocMimetype;
                         }
                     }
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index 0789c82d3e80..6de525024a6b 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -64,11 +64,11 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
 
     for ( sal_Int32 i = 0 ; ( i < nLength ) && !xOStm.is(); ++i)
     {
-        if( pValue[ i ].Name.equalsAscii( "OutputStream" ) )
+        if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
             pValue[ i ].Value >>= xOStm;
-        else if( pValue[ i ].Name.equalsAscii( "FilterData" ) )
+        else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterData" ) ) )
             pValue[ i ].Value >>= aFilterData;
-        else if ( pValue[ i ].Name.equalsAscii( "StatusIndicator" ) )
+        else if ( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
             pValue[ i ].Value >>= xStatusIndicator;
     }
 
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index b7e99f5c607a..89770828cd1e 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -132,9 +132,9 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
 
     for ( sal_Int32 i = 0 ; i < nLength; ++i)
     {
-        if( pValue[ i ].Name.equalsAscii( "OutputStream" ) )
+        if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OutputStream" ) ) )
             pValue[ i ].Value >>= xOStm;
-        else if( pValue[ i ].Name.equalsAscii( "FileName" ) )
+        else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileName" ) ) )
         {
             ::rtl::OUString aFileName;
 
@@ -144,7 +144,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
             if( pOStm )
                 xOStm = Reference< XOutputStream >( new ::utl::OOutputStreamWrapper ( *pOStm ) );
         }
-        else if( pValue[ i ].Name.equalsAscii( "PagePos" ) )
+        else if( pValue[ i ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PagePos" ) ) )
             pValue[ i ].Value >>= nPageToExport;
    }
 
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 892a5860b2b7..c2cb0c820e48 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -173,7 +173,7 @@ rtl::OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescrip
     const sal_Int32 nAttribs = io_rDescriptor.getLength();
     for( sal_Int32 i = 0; i < nAttribs; i++ )
     {
-        if( pAttribs[i].Name.equalsAscii( "InputStream" ) )
+        if( pAttribs[i].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
             pAttribs[i].Value >>= xInput;
     }
 
diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx
index c09488f16c45..b5514170b84b 100644
--- a/filter/source/svg/svgimport.cxx
+++ b/filter/source/svg/svgimport.cxx
@@ -63,11 +63,11 @@ sal_Bool SVGFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     const beans::PropertyValue* pAttribs = rDescriptor.getConstArray();
     for ( sal_Int32 i=0 ; i<nLength; ++i, ++pAttribs )
     {
-        if( pAttribs->Name.equalsAscii( "InputStream" ) )
+        if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
         {
             pAttribs->Value >>= xInputStream;
         }
-        else if( pAttribs->Name.equalsAscii( "StatusIndicator" ) )
+        else if( pAttribs->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StatusIndicator" ) ) )
             pAttribs->Value >>= xStatus;
     }
 
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 67e5432991e5..4f2b9eb141c7 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -183,7 +183,7 @@ struct AnnotatingVisitor
                 {
                     const rtl::OUString sValue(xNode->getNodeValue());
                     ElementRefMapType::iterator aFound=maGradientIdMap.end();
-                    if (sValue.copy(0,1).equalsAscii("#"))
+                    if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
                         aFound = maGradientIdMap.find(sValue.copy(1));
                     else
                         aFound = maGradientIdMap.find(sValue);;
@@ -221,7 +221,7 @@ struct AnnotatingVisitor
                 {
                     const rtl::OUString sValue(xNode->getNodeValue());
                     ElementRefMapType::iterator aFound=maGradientIdMap.end();
-                    if (sValue.copy(0,1).equalsAscii("#"))
+                    if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
                         aFound = maGradientIdMap.find(sValue.copy(1));
                     else
                         aFound = maGradientIdMap.find(sValue);;
@@ -820,7 +820,7 @@ struct AnnotatingVisitor
             case XML_HREF:
             {
                 ElementRefMapType::iterator aFound=maStopIdMap.end();
-                if (sValue.copy(0,1).equalsAscii("#"))
+                if (sValue.copy(0,1).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("#")))
                     aFound = maStopIdMap.find(sValue.copy(1));
                 else
                     aFound = maStopIdMap.find(sValue);;
@@ -2412,7 +2412,7 @@ struct ShapeRenderingVisitor
                 aFont.SetColor(getVclColor(maCurrState.maFillColor));
                 aFont.SetFillColor(getVclColor(maCurrState.maFillColor));
 
-                if( !maCurrState.maFontStyle.equalsAscii("normal") )
+                if( !maCurrState.maFontStyle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("normal")) )
                     aFont.SetItalic(ITALIC_NORMAL); // TODO: discriminate
                 if( !maCurrState.mnFontWeight != 400.0 )
                     aFont.SetWeight(WEIGHT_BOLD); // TODO: discriminate
diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx
index baff6df9c161..5fa92e9b0a7b 100644
--- a/filter/source/xmlfilterdetect/filterdetect.cxx
+++ b/filter/source/xmlfilterdetect/filterdetect.cxx
@@ -174,7 +174,7 @@ Reference< com::sun::star::frame::XModel > xModel;
                 {
                     ::rtl::OUString tmpStr;
                     lProps[j].Value >>=tmpStr;
-                    if((lProps[j].Name.equalsAscii("ClipboardFormat")) && (!tmpStr.equalsAscii("")) )
+                    if((lProps[j].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ClipboardFormat"))) && (!tmpStr.equalsAscii("")) )
                     {
                         sTypeName = supportedByType(tmpStr,resultString, myTypes[i]);
                     }
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index bb5eed8272c4..d2ec25e7a222 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -255,7 +255,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
     if( maStack.empty() )
     {
         // #109668# support legacy name as well on import
-        if( aName == sRootNode || aName.equalsAscii("oor:node") )
+        if( aName == sRootNode || aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("oor:node")) )
         {
             eNewState = e_Root;
         }
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index b9ab0c9d7b7e..5d39f4ef907b 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -411,7 +411,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
 
             for( nValue = 0; nValue < nValueCount; nValue++, pValues++ )
             {
-                if( pValues->Name.equalsAscii( "UIName" ) )
+                if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
                 {
                     OUString aInterfaceName;
                     pValues->Value >>= aInterfaceName;
@@ -743,7 +743,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
                     for( nIndex = 0; nIndex < nCount; nIndex++ )
                     {
                         OUString aName( aSequence[nIndex].Name );
-                        if( aSequence[nIndex].Name.equalsAscii( "Types" ) )
+                        if( aSequence[nIndex].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Types" ) ) )
                         {
                             Sequence< OUString > aTypes;
                             if( aSequence[nIndex].Value >>= aTypes )
@@ -857,7 +857,7 @@ void XMLFilterSettingsDialog::onDelete()
 
                         for( nValue = 0; (nValue < nValueCount) && !bTypeStillUsed; nValue++, pValues++ )
                         {
-                            if( pValues->Name.equalsAscii( "Type" ) )
+                            if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
                             {
                                 OUString aType;
                                 pValues->Value >>= aType;
@@ -1111,46 +1111,46 @@ void XMLFilterSettingsDialog::initFilterList()
 
                 for( nValue = 0; nValue < nValueCount; nValue++, pValues++ )
                 {
-                    if( pValues->Name.equalsAscii( "Type" ) )
+                    if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maType;
                     }
-                    else if( pValues->Name.equalsAscii( "UIName" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maInterfaceName;
                     }
-                    else if( pValues->Name.equalsAscii( "DocumentService" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maDocumentService;
                     }
-                    else if( pValues->Name.equalsAscii( "FilterService" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FilterService" ) ) )
                     {
                         pValues->Value >>= aFilterService;
                     }
-                    else if( pValues->Name.equalsAscii( "Flags" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Flags" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maFlags;
                     }
-                    else if( pValues->Name.equalsAscii( "UserData" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UserData" ) ) )
                     {
                         pValues->Value >>= aUserData;
                     }
-                    else if( pValues->Name.equalsAscii( "FileFormatVersion" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileFormatVersion" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maFileFormatVersion;
                     }
-                    else if( pValues->Name.equalsAscii( "TemplateName" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TemplateName" ) ) )
                     {
                         pValues->Value >>= pTempFilter->maImportTemplate;
                     }
-                    else if(pValues->Name.equalsAscii( "Finalized" ))
+                    else if(pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Finalized" ) ))
                     {
                         pValues->Value >>= pTempFilter->mbReadonly;
                     }
                 }
 
                 // if this is not a XmlFilterAdaptor entry, skip it
-                if( !aFilterService.equalsAscii( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) )
+                if( !aFilterService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ) )
                     continue;
 
 
@@ -1159,7 +1159,7 @@ void XMLFilterSettingsDialog::initFilterList()
                     continue;
 
                 // if this is not an XSLTFilter entry, skip it
-                if( !aUserData[0].equalsAscii( "com.sun.star.documentconversion.XSLTFilter" ) )
+                if( !aUserData[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.documentconversion.XSLTFilter" ) ) )
                     continue;
 
                 // get filter information from userdata
@@ -1189,12 +1189,12 @@ void XMLFilterSettingsDialog::initFilterList()
                             for( nValue2 = 0; nValue2 < nValueCount2; nValue2++, pValues2++ )
                             {
 /*
-                                if( pValues2->Name.equalsAscii( "MediaType" ) )
+                                if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
                                 {
                                     pValues2->Value >>= pTempFilter->maDocType;
                                 } else
 */
-                                if( pValues2->Name.equalsAscii( "ClipboardFormat" ) )
+                                if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ClipboardFormat" ) ) )
                                 {
                                     OUString aDocType;
                                     pValues2->Value >>= aDocType;
@@ -1204,7 +1204,7 @@ void XMLFilterSettingsDialog::initFilterList()
 
                                     pTempFilter->maDocType = aDocType;
                                 }
-                                else if( pValues2->Name.equalsAscii( "Extensions" ) )
+                                else if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Extensions" ) ) )
                                 {
                                     Sequence< OUString > aExtensions;
                                     if( pValues2->Value >>= aExtensions )
@@ -1222,11 +1222,11 @@ void XMLFilterSettingsDialog::initFilterList()
                                         }
                                     }
                                 }
-                                else if( pValues2->Name.equalsAscii( "DocumentIconID" ) )
+                                else if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentIconID" ) ) )
                                 {
                                     pValues2->Value >>= pTempFilter->mnDocumentIconID;
                                 }
-                                else if(pValues2->Name.equalsAscii( "Finalized" ))
+                                else if(pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Finalized" ) ))
                                 {
                                     // both the filter and the type may be finalized
                                     sal_Bool bTemp = sal_False;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index c7621254c3c5..32167288c449 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -200,7 +200,7 @@ bool XMLFilterTabDialog::onOk()
 
                         for( nValue = 0; (nValue < nValueCount) && (nErrorId == 0); nValue++, pValues++ )
                         {
-                            if( pValues->Name.equalsAscii( "UIName" ) )
+                            if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
                             {
                                 OUString aInterfaceName;
                                 pValues->Value >>= aInterfaceName;
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 894260409348..d6c7ee805afc 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -353,22 +353,22 @@ void XMLFilterTestDialog::onExportBrowse()
 
                 for( sal_Int32  nValue = 0; (nValue < aValues.getLength()) && (nFound != 15); nValue++, pValues++ )
                 {
-                    if( pValues->Name.equalsAscii( "Type" ) )
+                    if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Type" ) ) )
                     {
                         pValues->Value >>= aType;
                         nFound |= 1;
                     }
-                    else if( pValues->Name.equalsAscii( "DocumentService" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DocumentService" ) ) )
                     {
                         pValues->Value >>= aService;
                         nFound |= 2;
                     }
-                    else if( pValues->Name.equalsAscii( "Flags" ) )
+                    else if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Flags" ) ) )
                     {
                         pValues->Value >>= nFlags;
                         nFound |= 4;
                     }
-                    if( pValues->Name.equalsAscii( "UIName" ) )
+                    if( pValues->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "UIName" ) ) )
                     {
                         pValues->Value >>= aInterfaceName;
                         nFound |= 8;
@@ -392,7 +392,7 @@ void XMLFilterTestDialog::onExportBrowse()
                             OUString aExtension;
                             for( nValue = 0; nValue < aValues2.getLength(); nValue++, pValues2++ )
                             {
-                                if( pValues2->Name.equalsAscii( "Extensions" ) )
+                                if( pValues2->Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Extensions" ) ) )
                                 {
                                     Sequence< OUString > aExtensions;
                                     if( pValues2->Value >>= aExtensions )
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 73200ac24d42..c49faf479579 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -382,11 +382,11 @@ sal_Bool XSLTFilter::importer(
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
         aName = aSourceData[i].Name;
-        if (aName.equalsAscii("InputStream"))
+        if (aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("InputStream")))
             aSourceData[i].Value >>= xInputStream;
-        else if ( aName.equalsAscii("FileName"))
+        else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName")))
             aSourceData[i].Value >>= aFileName;
-        else if ( aName.equalsAscii("URL"))
+        else if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("URL")))
             aSourceData[i].Value >>= aURL;
     }
     OSL_ASSERT(xInputStream.is());
@@ -500,15 +500,15 @@ sal_Bool XSLTFilter::exporter(
     for ( sal_Int32 i = 0 ; i < nLength; i++)
     {
         aName = aSourceData[i].Name;
-        if ( aName.equalsAscii("Indent"))
+        if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Indent")))
             aSourceData[i].Value >>= bIndent;
-        if ( aName.equalsAscii("DocType_Public"))
+        if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_Public")))
             aSourceData[i].Value >>= aDoctypePublic;
-        if ( aName.equalsAscii("DocType_System"))
+        if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("DocType_System")))
             aSourceData[i].Value >>= aDoctypeSystem;
-        if ( aName.equalsAscii("OutputStream"))
+        if ( aName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OutputStream")))
             aSourceData[i].Value >>= m_rOutputStream;
-        else if ( aName.equalsAscii("URL" ))
+        else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("URL" ) ))
             aSourceData[i].Value >>= sURL;
     }
 
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index ec6446265abc..682e6887be8b 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -176,41 +176,41 @@ void SAL_CALL FilterDetectDocHandler::processingInstruction(
 void FilterDetectDocHandler::parseRelationship( const AttributeList& rAttribs )
 {
     OUString aType = rAttribs.getString( XML_Type, OUString() );
-    if( aType.equalsAscii( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ) )
+    if( aType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ) ) )
         maTargetPath = OUString( sal_Unicode( '/' ) ) + rAttribs.getString( XML_Target, OUString() );
 }
 
 OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& rContentType ) const
 {
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-word.document.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-word.document.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "writer_MS_Word_2007" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" ) ) )
         return CREATE_OUSTRING( "writer_MS_Word_2007_Template" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-excel.sheet.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-excel.sheet.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "MS Excel 2007 XML" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-excel.template.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-excel.template.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "MS Excel 2007 XML Template" );
 
-    if( rContentType.equalsAscii( "application/vnd.ms-excel.sheet.binary.macroEnabled.main" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-excel.sheet.binary.macroEnabled.main" ) ) )
         return CREATE_OUSTRING( "MS Excel 2007 Binary" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "MS PowerPoint 2007 XML" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "MS PowerPoint 2007 XML AutoPlay" );
 
-    if( rContentType.equalsAscii( "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ) ||
-        rContentType.equalsAscii( "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" ) )
+    if( rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ) ) ||
+        rContentType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" ) ) )
         return CREATE_OUSTRING( "MS PowerPoint 2007 XML Template" );
 
     return OUString();
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 1631920c6452..bf29d6078192 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -134,11 +134,11 @@ Reference< XFastContextHandler > GraphicalObjectFrameContext::createFastChildCon
         case XML_graphicData :          // CT_GraphicalObjectData
         {
             OUString sUri( xAttribs->getOptionalValue( XML_uri ) );
-            if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/presentationml/2006/ole" ) )
+            if ( sUri.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http://schemas.openxmlformats.org/presentationml/2006/ole" ) ) )
                 xRet.set( new OleObjectGraphicDataContext( *this, mpShapePtr ) );
-            else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/diagram" ) )
+            else if ( sUri.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http://schemas.openxmlformats.org/drawingml/2006/diagram" ) ) )
                 xRet.set( new DiagramGraphicDataContext( *this, mpShapePtr ) );
-            else if ( sUri.equalsAscii( "http://schemas.openxmlformats.org/drawingml/2006/chart" ) )
+            else if ( sUri.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "http://schemas.openxmlformats.org/drawingml/2006/chart" ) ) )
                 xRet.set( new ChartGraphicDataContext( *this, mpShapePtr, mbEmbedShapesInChart ) );
             else if ( sUri.compareToAscii( "http://schemas.openxmlformats.org/drawingml/2006/table" ) == 0 )
                 xRet.set( new table::TableContext( *this, mpShapePtr ) );
diff --git a/oox/source/dump/biffdumper.cxx b/oox/source/dump/biffdumper.cxx
index ad850923a0bd..d8bfccc46610 100644
--- a/oox/source/dump/biffdumper.cxx
+++ b/oox/source/dump/biffdumper.cxx
@@ -2396,7 +2396,7 @@ void WorkbookStreamObject::implDumpRecordBody()
 
         case BIFF_ID_HYPERLINK:
             dumpRange();
-            if( cfg().getStringOption( dumpGuid( "guid" ), OUString() ).equalsAscii( "StdHlink" ) )
+            if( cfg().getStringOption( dumpGuid( "guid" ), OUString() ).equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdHlink" ) ) )
                 StdHlinkObject( *this ).dump();
         break;
 
@@ -4310,11 +4310,11 @@ RootStorageObject::RootStorageObject( const DumperBase& rParent )
 
 void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( (rStrgPath.getLength() == 0) && (rStrmName.equalsAscii( "Book" ) || rStrmName.equalsAscii( "Workbook" )) )
+    if( (rStrgPath.getLength() == 0) && (rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Book" ) ) || rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Workbook" ) )) )
         WorkbookStreamObject( *this, rxStrm, rSysFileName ).dump();
-    else if( rStrgPath.equalsAscii( "_SX_DB" ) )
+    else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "_SX_DB" ) ) )
         PivotCacheStreamObject( *this, rxStrm, BIFF5, rSysFileName ).dump();
-    else if( rStrgPath.equalsAscii( "_SX_DB_CUR" ) )
+    else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "_SX_DB_CUR" ) ) )
         PivotCacheStreamObject( *this, rxStrm, BIFF8, rSysFileName ).dump();
     else
         OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
@@ -4322,7 +4322,7 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
 
 void RootStorageObject::implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, const OUString& rSysPath )
 {
-    if( rStrgPath.equalsAscii( "_VBA_PROJECT_CUR" ) )
+    if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "_VBA_PROJECT_CUR" ) ) )
         VbaProjectStorageObject( *this, rxStrg, rSysPath ).dump();
     else if( rStrgPath.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( "MBD" ) ) )
         VbaContainerStorageObject( *this, rxStrg, rSysPath ).dump();
diff --git a/oox/source/dump/dffdumper.cxx b/oox/source/dump/dffdumper.cxx
index 52aff8a57e3a..fce6ba9a0766 100644
--- a/oox/source/dump/dffdumper.cxx
+++ b/oox/source/dump/dffdumper.cxx
@@ -242,13 +242,13 @@ void DffStreamObject::dumpDffOpt()
             {
                 const ItemFormat& rItemFmt = aIt->second;
                 aName = rItemFmt.maItemName;
-                if( rItemFmt.maListName.equalsAscii( "binary" ) )
+                if( rItemFmt.maListName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "binary" ) ) )
                     eType = PROPTYPE_BINARY;
-                else if( rItemFmt.maListName.equalsAscii( "string" ) )
+                else if( rItemFmt.maListName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "string" ) ) )
                     eType = PROPTYPE_STRING;
-                else if( rItemFmt.maListName.equalsAscii( "blip" ) )
+                else if( rItemFmt.maListName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "blip" ) ) )
                     eType = PROPTYPE_BLIP;
-                else if( rItemFmt.maListName.equalsAscii( "colorarray" ) )
+                else if( rItemFmt.maListName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "colorarray" ) ) )
                     eType = PROPTYPE_COLORARRAY;
             }
             aPropInfos.push_back( PropInfo( aName( "property-data" ), eType, nBaseId, nValue ) );
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index 59acfecf19f5..d06734cc974c 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -234,9 +234,9 @@ OUStringVector::const_iterator ItemFormat::parse( const OUStringVector& rFormatV
 
     if( meFmtType == FORMATTYPE_NONE )
     {
-        if( aFmtType.equalsAscii( "unused" ) )
+        if( aFmtType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "unused" ) ) )
             set( meDataType, FORMATTYPE_HEX, CREATE_OUSTRING( OOX_DUMP_UNUSED ) );
-        else if( aFmtType.equalsAscii( "unknown" ) )
+        else if( aFmtType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "unknown" ) ) )
             set( meDataType, FORMATTYPE_HEX, CREATE_OUSTRING( OOX_DUMP_UNKNOWN ) );
     }
 
@@ -790,25 +790,25 @@ OString StringHelper::convertToUtf8( const OUString& rStr )
 DataType StringHelper::convertToDataType( const OUString& rStr )
 {
     DataType eType = DATATYPE_VOID;
-    if( rStr.equalsAscii( "int8" ) )
+    if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int8" ) ) )
         eType = DATATYPE_INT8;
-    else if( rStr.equalsAscii( "uint8" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "uint8" ) ) )
         eType = DATATYPE_UINT8;
-    else if( rStr.equalsAscii( "int16" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int16" ) ) )
         eType = DATATYPE_INT16;
-    else if( rStr.equalsAscii( "uint16" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "uint16" ) ) )
         eType = DATATYPE_UINT16;
-    else if( rStr.equalsAscii( "int32" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int32" ) ) )
         eType = DATATYPE_INT32;
-    else if( rStr.equalsAscii( "uint32" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "uint32" ) ) )
         eType = DATATYPE_UINT32;
-    else if( rStr.equalsAscii( "int64" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "int64" ) ) )
         eType = DATATYPE_INT64;
-    else if( rStr.equalsAscii( "uint64" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "uint64" ) ) )
         eType = DATATYPE_UINT64;
-    else if( rStr.equalsAscii( "float" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "float" ) ) )
         eType = DATATYPE_FLOAT;
-    else if( rStr.equalsAscii( "double" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "double" ) ) )
         eType = DATATYPE_DOUBLE;
     return eType;
 }
@@ -816,17 +816,17 @@ DataType StringHelper::convertToDataType( const OUString& rStr )
 FormatType StringHelper::convertToFormatType( const OUString& rStr )
 {
     FormatType eType = FORMATTYPE_NONE;
-    if( rStr.equalsAscii( "dec" ) )
+    if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dec" ) ) )
         eType = FORMATTYPE_DEC;
-    else if( rStr.equalsAscii( "hex" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "hex" ) ) )
         eType = FORMATTYPE_HEX;
-    else if( rStr.equalsAscii( "shorthex" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "shorthex" ) ) )
         eType = FORMATTYPE_SHORTHEX;
-    else if( rStr.equalsAscii( "bin" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bin" ) ) )
         eType = FORMATTYPE_BIN;
-    else if( rStr.equalsAscii( "fix" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "fix" ) ) )
         eType = FORMATTYPE_FIX;
-    else if( rStr.equalsAscii( "bool" ) )
+    else if( rStr.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "bool" ) ) )
         eType = FORMATTYPE_BOOL;
     return eType;
 }
@@ -890,9 +890,9 @@ bool StringHelper::convertStringToDouble( double& orfData, const OUString& rData
 
 bool StringHelper::convertStringToBool( const OUString& rData )
 {
-    if( rData.equalsAscii( "true" ) )
+    if( rData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "true" ) ) )
         return true;
-    if( rData.equalsAscii( "false" ) )
+    if( rData.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "false" ) ) )
         return false;
     sal_Int64 nData;
     return convertStringToInt( nData, rData ) && (nData != 0);
@@ -1099,7 +1099,7 @@ ConfigItemBase::LineType ConfigItemBase::readConfigLine(
     OUStringPair aPair = StringHelper::convertStringToPair( aLine );
     orKey = aPair.first;
     orData = aPair.second;
-    return ((orKey.getLength() > 0) && ((orData.getLength() > 0) || !orKey.equalsAscii( "end" ))) ?
+    return ((orKey.getLength() > 0) && ((orData.getLength() > 0) || !orKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "end" ) ))) ?
         LINETYPE_DATA : LINETYPE_END;
 }
 
@@ -1148,9 +1148,9 @@ bool NameListBase::implIsValid() const
 void NameListBase::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
-    if( rKey.equalsAscii( "include" ) )
+    if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "include" ) ) )
         include( rData );
-    else if( rKey.equalsAscii( "exclude" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "exclude" ) ) )
         exclude( rData );
     else
         ConfigItemBase::implProcessConfigItemStr( rStrm, rKey, rData );
@@ -1210,9 +1210,9 @@ ConstList::ConstList( const SharedConfigData& rCfgData ) :
 void ConstList::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
-    if( rKey.equalsAscii( "default" ) )
+    if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "default" ) ) )
         setDefaultName( rData );
-    else if( rKey.equalsAscii( "quote-names" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "quote-names" ) ) )
         setQuoteNames( StringHelper::convertStringToBool( rData ) );
     else
         NameListBase::implProcessConfigItemStr( rStrm, rKey, rData );
@@ -1269,7 +1269,7 @@ void MultiList::setNamesFromVec( sal_Int64 nStartKey, const OUStringVector& rNam
 void MultiList::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
-    if( rKey.equalsAscii( "ignore-empty" ) )
+    if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ignore-empty" ) ) )
         mbIgnoreEmpty = StringHelper::convertStringToBool( rData );
     else
         ConstList::implProcessConfigItemStr( rStrm, rKey, rData );
@@ -1293,7 +1293,7 @@ FlagsList::FlagsList( const SharedConfigData& rCfgData ) :
 void FlagsList::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
-    if( rKey.equalsAscii( "ignore" ) )
+    if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ignore" ) ) )
     {
         sal_Int64 nIgnore;
         if( StringHelper::convertStringToInt( nIgnore, rData ) )
@@ -1398,11 +1398,11 @@ void CombiList::implSetName( sal_Int64 nKey, const OUString& rName )
         for( OUStringVector::iterator aIt = aRemain.begin(), aEnd = aRemain.end(); aIt != aEnd; ++aIt )
         {
             OUStringPair aPair = StringHelper::convertStringToPair( *aIt );
-            if( aPair.first.equalsAscii( "noshift" ) )
+            if( aPair.first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "noshift" ) ) )
             {
                 aItemFmt.mbShiftValue = StringHelper::convertStringToBool( aPair.second );
             }
-            else if( aPair.first.equalsAscii( "filter" ) )
+            else if( aPair.first.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "filter" ) ) )
             {
                 OUStringPair aFilter = StringHelper::convertStringToPair( aPair.second, '~' );
                 ExtItemFormatKey aKey( nKey );
@@ -1604,19 +1604,19 @@ bool SharedConfigData::implIsValid() const
 void SharedConfigData::implProcessConfigItemStr(
         TextInputStream& rStrm, const OUString& rKey, const OUString& rData )
 {
-    if( rKey.equalsAscii( "include-config-file" ) )
+    if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "include-config-file" ) ) )
         readConfigFile( maConfigPath + rData );
-    else if( rKey.equalsAscii( "constlist" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "constlist" ) ) )
         readNameList< ConstList >( rStrm, rData );
-    else if( rKey.equalsAscii( "multilist" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "multilist" ) ) )
         readNameList< MultiList >( rStrm, rData );
-    else if( rKey.equalsAscii( "flagslist" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "flagslist" ) ) )
         readNameList< FlagsList >( rStrm, rData );
-    else if( rKey.equalsAscii( "combilist" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "combilist" ) ) )
         readNameList< CombiList >( rStrm, rData );
-    else if( rKey.equalsAscii( "shortlist" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "shortlist" ) ) )
         createShortList( rData );
-    else if( rKey.equalsAscii( "unitconverter" ) )
+    else if( rKey.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "unitconverter" ) ) )
         createUnitConverter( rData );
     else
         setOption( rKey, rData );
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index 32f953df5ce2..61874f1ad767 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -178,15 +178,15 @@ bool StdHlinkObject::dumpGuidAndMoniker()
     bool bValidMoniker = true;
     OUString aGuid = cfg().getStringOption( dumpGuid( "moniker" ), OUString() );
     IndentGuard aIndGuard( mxOut );
-    if( aGuid.equalsAscii( "URLMoniker" ) )
+    if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URLMoniker" ) ) )
         dumpUrlMoniker();
-    else if( aGuid.equalsAscii( "FileMoniker" ) )
+    else if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "FileMoniker" ) ) )
         dumpFileMoniker();
-    else if( aGuid.equalsAscii( "ItemMoniker" ) )
+    else if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ItemMoniker" ) ) )
         dumpItemMoniker();
-    else if( aGuid.equalsAscii( "AntiMoniker" ) )
+    else if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AntiMoniker" ) ) )
         dumpAntiMoniker();
-    else if( aGuid.equalsAscii( "CompositeMoniker" ) )
+    else if( aGuid.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CompositeMoniker" ) ) )
         dumpCompositeMoniker();
     else
         bValidMoniker = false;
@@ -380,9 +380,9 @@ void OlePropertyStreamObject::dumpSection( const OUString& rGuid, sal_uInt32 nSt
     // property ID names
     mxPropIds = cfg().createNameList< ConstList >( "OLEPROP-IDS" );
     OUString aGuidName = cfg().getStringOption( rGuid, OUString() );
-    if( aGuidName.equalsAscii( "GlobalDocProp" ) )
+    if( aGuidName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GlobalDocProp" ) ) )
         mxPropIds->includeList( cfg().getNameList( "OLEPROP-GLOBALIDS" ) );
-    else if( aGuidName.equalsAscii( "BuiltinDocProp" ) )
+    else if( aGuidName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "BuiltinDocProp" ) ) )
         mxPropIds->includeList( cfg().getNameList( "OLEPROP-BUILTINIDS" ) );
     else
         mxPropIds->includeList( cfg().getNameList( "OLEPROP-BASEIDS" ) );
@@ -640,9 +640,9 @@ void OleStorageObject::construct( const ObjectBase& rParent )
 
 void OleStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& /*rStrgPath*/, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( rStrmName.equalsAscii( "\001CompObj" ) )
+    if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\001CompObj" ) ) )
         OleCompObjObject( *this, rxStrm, rSysFileName ).dump();
-    else if( rStrmName.equalsAscii( "\005SummaryInformation" ) || rStrmName.equalsAscii( "\005DocumentSummaryInformation" ) )
+    else if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\005SummaryInformation" ) ) || rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\005DocumentSummaryInformation" ) ) )
         OlePropertyStreamObject( *this, rxStrm, rSysFileName ).dump();
     else
         BinaryStreamObject( *this, rxStrm, rSysFileName ).dump();
@@ -741,7 +741,7 @@ bool ComCtlObjectBase::dumpComCtlComplex()
             writeEmptyItem( "font" );
             IndentGuard aIndGuard2( mxOut );
             OUString aClassName = cfg().getStringOption( dumpGuid(), OUString() );
-            if( aClassName.equalsAscii( "StdFont" ) )
+            if( aClassName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdFont" ) ) )
                 StdFontObject( *this ).dump();
         }
         if( !mxStrm->isEof() && (nFlags & 0x02) )
@@ -749,7 +749,7 @@ bool ComCtlObjectBase::dumpComCtlComplex()
             writeEmptyItem( "mouse-icon" );
             IndentGuard aIndGuard2( mxOut );
             OUString aClassName = cfg().getStringOption( dumpGuid(), OUString() );
-            if( aClassName.equalsAscii( "StdPic" ) )
+            if( aClassName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdPic" ) ) )
                 StdPicObject( *this ).dump();
         }
         return !mxStrm->isEof();
@@ -1303,11 +1303,11 @@ void AxPropertyObjectBase::dumpLargeProperties()
             {
                 IndentGuard aIndGuard2( mxOut );
                 OUString aClassName = cfg().getStringOption( dumpGuid(), OUString() );
-                if( aClassName.equalsAscii( "StdFont" ) )
+                if( aClassName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdFont" ) ) )
                     StdFontObject( *this ).dump();
-                else if( aClassName.equalsAscii( "StdPic" ) )
+                else if( aClassName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdPic" ) ) )
                     StdPicObject( *this ).dump();
-                else if( aClassName.equalsAscii( "CFontNew" ) )
+                else if( aClassName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CFontNew" ) ) )
                     AxCFontNewObject( *this ).dump();
                 else
                     ensureValid( false );
@@ -1618,55 +1618,55 @@ void FormControlStreamObject::implDump()
 
     if( (maProgId.getLength() > 0) && !mxStrm->isEof() )
     {
-        if( maProgId.equalsAscii( "Forms.CommandButton.1" ) )
+        if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.CommandButton.1" ) ) )
             AxCommandButtonObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.TextBox.1" ) ||
-                 maProgId.equalsAscii( "Forms.ListBox.1" ) ||
-                 maProgId.equalsAscii( "Forms.ComboBox.1" ) ||
-                 maProgId.equalsAscii( "Forms.CheckBox.1" ) ||
-                 maProgId.equalsAscii( "Forms.OptionButton.1" ) ||
-                 maProgId.equalsAscii( "Forms.ToggleButton.1" ) ||
-                 maProgId.equalsAscii( "RefEdit.Ctrl" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.TextBox.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.ListBox.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.ComboBox.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.CheckBox.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.OptionButton.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.ToggleButton.1" ) ) ||
+                 maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "RefEdit.Ctrl" ) ) )
             AxMorphControlObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.Label.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.Label.1" ) ) )
             AxLabelObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.Image.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.Image.1" ) ) )
             AxImageObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.ScrollBar.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.ScrollBar.1" ) ) )
             AxScrollBarObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.SpinButton.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.SpinButton.1" ) ) )
             AxSpinButtonObject( *this ).dump();
-        else if( maProgId.equalsAscii( "Forms.TabStrip.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Forms.TabStrip.1" ) ) )
             AxTabStripObject( *this ).dump();
-        else if( maProgId.equalsAscii( "MSComCtl2.FlatScrollBar.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComCtl2.FlatScrollBar.2" ) ) )
             ComCtlScrollBarObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.ProgCtrl.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.ProgCtrl.1" ) ) )
             ComCtlProgressBarObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComctlLib.ProgCtrl.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComctlLib.ProgCtrl.2" ) ) )
             ComCtlProgressBarObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.Slider.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.Slider.1" ) ) )
             ComCtlSliderObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComctlLib.Slider.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComctlLib.Slider.2" ) ) )
             ComCtlSliderObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "ComCtl2.UpDown.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ComCtl2.UpDown.1" ) ) )
             ComCtlUpDownObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComCtl2.UpDown.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComCtl2.UpDown.2" ) ) )
             ComCtlUpDownObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.ImageListCtrl.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.ImageListCtrl.1" ) ) )
             ComCtlImageListObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComctlLib.ImageListCtrl.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComctlLib.ImageListCtrl.2" ) ) )
             ComCtlImageListObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.TabStrip.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.TabStrip.1" ) ) )
             ComCtlTabStripObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComctlLib.TabStrip.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComctlLib.TabStrip.2" ) ) )
             ComCtlTabStripObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.TreeCtrl.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.TreeCtrl.1" ) ) )
             ComCtlTreeViewObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "MSComctlLib.TreeCtrl.2" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "MSComctlLib.TreeCtrl.2" ) ) )
             ComCtlTreeViewObject( *this, 6 ).dump();
-        else if( maProgId.equalsAscii( "COMCTL.SBarCtrl.1" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "COMCTL.SBarCtrl.1" ) ) )
             ComCtlStatusBarObject( *this, 5 ).dump();
-        else if( maProgId.equalsAscii( "StdPic" ) )
+        else if( maProgId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "StdPic" ) ) )
             StdPicObject( *this ).dump();
     }
     dumpRemainingStream();
@@ -2021,11 +2021,11 @@ VbaContainerStorageObject::VbaContainerStorageObject( const ObjectBase& rParent,
 
 void VbaContainerStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( rStrmName.equalsAscii( "f" ) )
+    if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "f" ) ) )
         VbaFStreamObject( *this, rxStrm, rSysFileName, maFormData ).dump();
-    else if( rStrmName.equalsAscii( "o" ) )
+    else if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "o" ) ) )
         VbaOStreamObject( *this, rxStrm, rSysFileName, maFormData ).dump();
-    else if( rStrmName.equalsAscii( "x" ) )
+    else if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "x" ) ) )
         VbaXStreamObject( *this, rxStrm, rSysFileName, maFormData ).dump();
     else
         OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
@@ -2245,7 +2245,7 @@ VbaStorageObject::VbaStorageObject( const ObjectBase& rParent, const StorageRef&
 
 void VbaStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( (rStrgPath.getLength() == 0) && rStrmName.equalsAscii( "dir" ) )
+    if( (rStrgPath.getLength() == 0) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "dir" ) ) )
         VbaDirStreamObject( *this, rxStrm, rSysFileName, mrVbaData ).dump();
     else if( mrVbaData.isModuleStream( rStrmName ) )
         VbaModuleStreamObject( *this, rxStrm, rSysFileName, mrVbaData, mrVbaData.getStreamOffset( rStrmName ) ).dump();
@@ -2263,7 +2263,7 @@ VbaFormStorageObject::VbaFormStorageObject( const ObjectBase& rParent, const Sto
 
 void VbaFormStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( rStrmName.equalsAscii( "\003VBFrame" ) )
+    if( rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "\003VBFrame" ) ) )
         TextStreamObject( *this, rxStrm, mrVbaData.meTextEnc, rSysFileName ).dump();
     else
         VbaContainerStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
@@ -2279,7 +2279,7 @@ VbaProjectStorageObject::VbaProjectStorageObject( const ObjectBase& rParent, con
 
 void VbaProjectStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, const OUString& rSysFileName )
 {
-    if( (rStrgPath.getLength() == 0) && rStrmName.equalsAscii( "PROJECT" ) )
+    if( (rStrgPath.getLength() == 0) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PROJECT" ) ) )
         TextStreamObject( *this, rxStrm, maVbaData.meTextEnc, rSysFileName ).dump();
     else
         OleStorageObject::implDumpStream( rxStrm, rStrgPath, rStrmName, rSysFileName );
@@ -2287,7 +2287,7 @@ void VbaProjectStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm
 
 void VbaProjectStorageObject::implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, const OUString& rSysPath )
 {
-    if( rStrgPath.equalsAscii( "VBA" ) )
+    if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "VBA" ) ) )
         VbaStorageObject( *this, rxStrg, rSysPath, maVbaData ).dump();
     else
         VbaFormStorageObject( *this, rxStrg, rSysPath, maVbaData ).dump();
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index d3af78a03e37..3bcfd20dc434 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -90,17 +90,17 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
     }
     else if( aExt.equalsIgnoreAsciiCaseAscii( "bin" ) )
     {
-        if( rStrgPath.equalsAscii( "ppt" ) && rStrmName.equalsAscii( "vbaProject.bin" ) )
+        if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
             VbaProjectStorageObject( *this, xStrg, rSysFileName ).dump();
         }
-        else if( rStrgPath.equalsAscii( "ppt/embeddings" ) )
+        else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt/embeddings" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
             OleStorageObject( *this, xStrg, rSysFileName ).dump();
         }
-        else if( rStrgPath.equalsAscii( "ppt/activeX" ) )
+        else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ppt/activeX" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, true ) );
             ActiveXStorageObject( *this, xStrg, rSysFileName ).dump();
diff --git a/oox/source/dump/xlsbdumper.cxx b/oox/source/dump/xlsbdumper.cxx
index ad4e68b4e842..74390046737e 100644
--- a/oox/source/dump/xlsbdumper.cxx
+++ b/oox/source/dump/xlsbdumper.cxx
@@ -2202,30 +2202,30 @@ void RootStorageObject::implDumpStream( const BinaryInputStreamRef& rxStrm, cons
     }
     else if( aExt.equalsIgnoreAsciiCaseAscii( "bin" ) )
     {
-        if( rStrgPath.equalsAscii( "xl" ) && rStrmName.equalsAscii( "vbaProject.bin" ) )
+        if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl" ) ) && rStrmName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "vbaProject.bin" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
             VbaProjectStorageObject( *this, xStrg, rSysFileName ).dump();
         }
-        else if( rStrgPath.equalsAscii( "xl/embeddings" ) )
+        else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/embeddings" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, false ) );
             OleStorageObject( *this, xStrg, rSysFileName ).dump();
         }
         else if(
-            rStrgPath.equalsAscii( "xl" ) ||
-            rStrgPath.equalsAscii( "xl/chartsheets" ) ||
-            rStrgPath.equalsAscii( "xl/dialogsheets" ) ||
-            rStrgPath.equalsAscii( "xl/externalLinks" ) ||
-            rStrgPath.equalsAscii( "xl/macrosheets" ) ||
-            rStrgPath.equalsAscii( "xl/pivotCache" ) ||
-            rStrgPath.equalsAscii( "xl/pivotTables" ) ||
-            rStrgPath.equalsAscii( "xl/tables" ) ||
-            rStrgPath.equalsAscii( "xl/worksheets" ) )
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/chartsheets" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/dialogsheets" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/externalLinks" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/macrosheets" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/pivotCache" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/pivotTables" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/tables" ) ) ||
+            rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/worksheets" ) ) )
         {
             RecordStreamObject( *this, rxStrm, rSysFileName ).dump();
         }
-        else if( rStrgPath.equalsAscii( "xl/activeX" ) )
+        else if( rStrgPath.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "xl/activeX" ) ) )
         {
             StorageRef xStrg( new ::oox::ole::OleStorage( getFactory(), xInStrm, true ) );
             ActiveXStorageObject( *this, xStrg, rSysFileName ).dump();
diff --git a/oox/source/export/ColorPropertySet.cxx b/oox/source/export/ColorPropertySet.cxx
index 235e09ccf227..3c95258c97c1 100644
--- a/oox/source/export/ColorPropertySet.cxx
+++ b/oox/source/export/ColorPropertySet.cxx
@@ -150,7 +150,7 @@ uno::Any SAL_CALL ColorPropertySet::getPropertyValue( const OUString& aPropertyN
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName.equalsAscii("FillStyle") && m_bIsFillColor )
+    if( aPropertyName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FillStyle")) && m_bIsFillColor )
     {
         ::com::sun::star::drawing::FillStyle aFillStyle = ::com::sun::star::drawing::FillStyle_SOLID;
         return uno::makeAny(aFillStyle);
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 13ecc8e9f2b0..b1f0386469b7 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -501,9 +501,9 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
                 const PropertyValue& rProp = aGeometrySeq[ i ];
                 DBG(printf("geometry property: %s\n", USS( rProp.Name )));
 
-                if( rProp.Name.equalsAscii( "AdjustmentValues" ))
+                if( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "AdjustmentValues" ) ))
                     nAdjustmentValuesIndex = i;
-                else if( rProp.Name.equalsAscii( "Handles" )) {
+                else if( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Handles" ) )) {
                     if( !bIsDefaultObject )
                         bPredefinedHandlesUsed = FALSE;
                     // TODO: update nAdjustmentsWhichNeedsToBeConverted here
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 860e6582502b..1e907806cb9f 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -205,7 +205,7 @@ namespace oox { namespace ppt {
                     if( maTo >>= aString )
                     {
                         OSL_TRACE( "Magic conversion %s", OUSTRING_TO_CSTR( aString ) );
-                        maTo = makeAny( aString.equalsAscii( "visible" ) ? sal_True : sal_False );
+                        maTo = makeAny( aString.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "visible" ) ) ? sal_True : sal_False );
                         if( !maTo.has<sal_Bool>() )
                             OSL_TRACE( "conversion failed" );
                     }
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 128e6abaa69d..7d57939ff2db 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -114,7 +114,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
         return 0;
 
     // TODO: according to spec, value may contain "auto"
-    if( rValue.equalsAscii( "auto" ) )
+    if( rValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "auto" ) ) )
     {
         OSL_ENSURE( false, "ConversionHelper::decodeMeasureToEmu - special value 'auto' must be handled by caller" );
         return nRefValue;
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index adbf9db205fa..5f3065e8e1f3 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -200,7 +200,7 @@ Reference< XShape > lclCreateAndInsertXShape( const XmlFilterBase& rFilter,
         const Reference< XShapes >& rxShapes, const OUString& rService, const Rectangle& rShapeRect )
 {
     Reference< XShape > xShape = lclCreateXShape( rFilter, rService );
-    if ( rService.equalsAscii( "com.sun.star.text.TextFrame" ) )
+    if ( rService.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFrame" ) ) )
         lclInsertTextFrame( rFilter, xShape );
     else
         lclInsertXShape( rxShapes, xShape );
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 9a20ab40151c..610960c5d486 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -265,13 +265,13 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
         OUString aName, aValue;
         if( ConversionHelper::separatePair( aName, aValue, rStyle.getToken( 0, ';', nIndex ), ':' ) )
         {
-                 if( aName.equalsAscii( "position" ) )      mrTypeModel.maPosition = aValue;
-            else if( aName.equalsAscii( "left" ) )          mrTypeModel.maLeft = aValue;
-            else if( aName.equalsAscii( "top" ) )           mrTypeModel.maTop = aValue;
-            else if( aName.equalsAscii( "width" ) )         mrTypeModel.maWidth = aValue;
-            else if( aName.equalsAscii( "height" ) )        mrTypeModel.maHeight = aValue;
-            else if( aName.equalsAscii( "margin-left" ) )   mrTypeModel.maMarginLeft = aValue;
-            else if( aName.equalsAscii( "margin-top" ) )    mrTypeModel.maMarginTop = aValue;
+                 if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "position" ) ) )      mrTypeModel.maPosition = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "left" ) ) )          mrTypeModel.maLeft = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "top" ) ) )           mrTypeModel.maTop = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "width" ) ) )         mrTypeModel.maWidth = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "height" ) ) )        mrTypeModel.maHeight = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "margin-left" ) ) )   mrTypeModel.maMarginLeft = aValue;
+            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "margin-top" ) ) )    mrTypeModel.maMarginTop = aValue;
         }
     }
 }
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 86cc045f9d66..3bc9f051c10a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3270,9 +3270,9 @@ void DomainMapper::sprm( Sprm& rSprm, PropertyMapPtr rContext, SprmType eSprmTyp
     {
         sal_Int16 nEscapement = 0;
         sal_Int8 nProp  = 58;
-        if( sStringValue.equalsAscii( "superscript" ))
+        if( sStringValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "superscript" ) ))
                 nEscapement = 101;
-        else if( sStringValue.equalsAscii( "subscript" ))
+        else if( sStringValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "subscript" ) ))
                 nEscapement = -101;
         else
             nProp = 100;
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index 7d1123caef81..acd445117c05 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -70,7 +70,7 @@ void MeasureHandler::attribute(Id rName, Value & rVal)
         case NS_ooxml::LN_CT_Height_hRule: // 90666;
         {
             ::rtl::OUString sHeightType = rVal.getString();
-            if( sHeightType.equalsAscii( "exact" ) )
+            if( sHeightType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "exact" ) ) )
                 m_nRowHeightSizeType = text::SizeType::FIX;
         }
         break;
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index 8b8ddac70eeb..06d044c17b23 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -53,7 +53,7 @@ ModelEventListener::~ModelEventListener()
   -----------------------------------------------------------------------*/
 void ModelEventListener::notifyEvent( const document::EventObject& rEvent ) throw (uno::RuntimeException)
 {
-    if( rEvent.EventName.equalsAscii("OnFocus"))
+    if( rEvent.EventName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("OnFocus")))
     {
         try
         {
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.cxx b/writerfilter/source/dmapper/PropertyMapHelper.cxx
index 8796aca1f038..bb4e353816fc 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.cxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.cxx
@@ -84,7 +84,7 @@ void lcl_DumpPropertyValues(const TagLogger::Pointer_t pLogger, beans::PropertyV
         {
         }
 
-        if (pValues[n].Name.equalsAscii("TableColumnSeparators"))
+        if (pValues[n].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("TableColumnSeparators")))
         {
             lcl_DumpTableColumnSeparators(pLogger, pValues[n].Value);
         }
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 14b956a841b6..ff4c6312d304 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -909,25 +909,25 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         }
 
                         uno::Reference< beans::XPropertyState >xState( xStyle, uno::UNO_QUERY_THROW );
-                        if( sConvertedStyleName.equalsAscii( "Contents Heading" ) ||
-                            sConvertedStyleName.equalsAscii( "User Index Heading" ) ||
-                            sConvertedStyleName.equalsAscii( "Index Heading" ))
+                        if( sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Contents Heading" ) ) ||
+                            sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "User Index Heading" ) ) ||
+                            sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Index Heading" ) ))
                         {
                             //left margin is set to NULL by default
                             uno::Reference< beans::XPropertyState >xState1( xStyle, uno::UNO_QUERY_THROW );
                             xState1->setPropertyToDefault(rPropNameSupplier.GetName( PROP_PARA_LEFT_MARGIN ));
                         }
-                        else if( sConvertedStyleName.equalsAscii( "Text body" ) )
+                        else if( sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Text body" ) ) )
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_PARA_BOTTOM_MARGIN ));
-                        else if( sConvertedStyleName.equalsAscii( "Heading 1" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 2" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 3" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 4" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 5" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 6" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 7" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 8" ) ||
-                                sConvertedStyleName.equalsAscii( "Heading 9" ) )
+                        else if( sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 1" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 2" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 3" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 4" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 5" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 6" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 7" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 8" ) ) ||
+                                sConvertedStyleName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Heading 9" ) ) )
                         {
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_WEIGHT ));
                             xState->setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_WEIGHT_ASIAN ));
@@ -953,8 +953,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                             dmapper_logger->attribute("value", aPropValues[nProp].Value);
 #endif
                                 // Don't add the style name properties
-                            bool bIsParaStyleName = aPropValues[nProp].Name.equalsAscii( "ParaStyleName" );
-                            bool bIsCharStyleName = aPropValues[nProp].Name.equalsAscii( "CharStyleName" );
+                            bool bIsParaStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ParaStyleName" ) );
+                            bool bIsCharStyleName = aPropValues[nProp].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CharStyleName" ) );
                             if ( !bIsParaStyleName && !bIsCharStyleName )
                             {
 #ifdef DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 1bcb5f2cee7e..c4fd70b7133d 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -117,7 +117,7 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
         else
         {
             uno::Reference< embed::XStorage > xDocStorage;
-            if( sURL.equalsAscii( "private:stream" ) )
+            if( sURL.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "private:stream" ) ) )
                 xDocStorage = comphelper::OStorageHelper::GetStorageFromInputStream( xInputStream );
             else
                 xDocStorage = comphelper::OStorageHelper::GetStorageFromURL(
diff --git a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
index 1bd7e16cd6fa..b177f74d9bdd 100644
--- a/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
+++ b/writerperfect/source/wpdimp/WordPerfectImportFilter.cxx
@@ -377,7 +377,7 @@ void SAL_CALL WordPerfectImportFilterDialog::setPropertyValues( const uno::Seque
 
         if ( aPropName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Password")) )
             rProp.Value >>= msPassword;
-        else if ( aPropName.equalsAscii( "InputStream" ) )
+        else if ( aPropName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "InputStream" ) ) )
             rProp.Value >>= mxInputStream;
     }
 }
author	Thomas Arnhold <thomas@arnhold.org>	2011-01-20 10:33:13 +0100
committer	Thomas Arnhold <thomas@arnhold.org>	2011-01-20 11:31:12 +0100
commit	4dd5c0b6b7b0df2b469635c96bc22fc2076f1997 (patch)
tree	f5143663aea7c9fbbb5567887d9c0ff594316ae0
parent	d870d4fa5d7179b05286f26ac9361074730f89e2 (diff)