Easy Hacks : RTL_CONSTASCII_USTRINGPARAM in libs-core

8 files changed, 78 insertions, 78 deletions

diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f4ddfd769f4a..ae661d18dcf4 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -267,7 +267,7 @@ rtl::OUString SAL_CALL
 BaseContent::getImplementationName()
     throw( RuntimeException)
 {
-    return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileContent" );
+    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileContent"));
 }
 
 
@@ -289,7 +289,7 @@ BaseContent::getSupportedServiceNames()
     throw( RuntimeException )
 {
     Sequence< rtl::OUString > ret( 1 );
-    ret[0] = rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContent" );
+    ret[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContent"));
     return ret;
 }
 
@@ -421,7 +421,7 @@ BaseContent::execute( const Command& aCommand,
     {
         Sequence< beans::Property > seq(1);
         seq[0] = beans::Property(
-            rtl::OUString::createFromAscii("CasePreservingURL"),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL")),
             -1,
             getCppuType( static_cast< sal_Bool* >(0) ),
             0 );
@@ -530,7 +530,7 @@ BaseContent::getContentType()
             {
                 // Who am I ?
                 Sequence< beans::Property > seq(1);
-                seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+                seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                                           -1,
                                           getCppuType( static_cast< sal_Bool* >(0) ),
                                           0 );
@@ -669,7 +669,7 @@ BaseContent::createNewContent(
     try
     {
         Sequence< beans::Property > seq(1);
-        seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+        seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                                   -1,
                                   getCppuType( static_cast< sal_Bool* >(0) ),
                                   0 );
@@ -872,7 +872,7 @@ BaseContent::setPropertyValues(
         return Sequence< Any >( Values.getLength() );
     }
 
-    const rtl::OUString Title = rtl::OUString::createFromAscii( "Title" );
+    const rtl::OUString Title(RTL_CONSTASCII_USTRINGPARAM("Title"));
 
     // Special handling for files which have to be inserted
     if( m_nState & JustInserted )
@@ -926,7 +926,7 @@ BaseContent::setPropertyValues(
                             // m_aUncPath contains parent's URI.
 
                             if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
-                                m_aUncPath += rtl::OUString::createFromAscii("/");
+                                m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                             m_aUncPath += rtl::Uri::encode( NewTitle,
                                                             rtl_UriCharClassPchar,
@@ -967,7 +967,7 @@ BaseContent::setPropertyValues(
 
             rtl::OUString aDstName = getParentName( m_aUncPath );
             if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 )
-                aDstName += rtl::OUString::createFromAscii("/");
+                aDstName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             aDstName += rtl::Uri::encode( NewTitle,
                                           rtl_UriCharClassPchar,
@@ -1129,7 +1129,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
 
     // Is destination a document or a folder ?
     Sequence< beans::Property > seq(1);
-    seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+    seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                               -1,
                               getCppuType( static_cast< sal_Bool* >(0) ),
                               0 );
@@ -1152,7 +1152,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
         // as child
         dstUncPath = m_aUncPath;
 
-    dstUncPath += ( rtl::OUString::createFromAscii( "/" ) + NewTitle );
+    dstUncPath += ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + NewTitle );
 
     sal_Int32 NameClash = aTransferInfo.NameClash;
 
@@ -1198,7 +1198,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
     sal_Bool bDocument = false;
 
     Sequence< beans::Property > seq(1);
-    seq[0] = beans::Property( rtl::OUString::createFromAscii("IsDocument"),
+    seq[0] = beans::Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsDocument")),
                               -1,
                               getCppuType( static_cast< sal_Bool* >(0) ),
                               0 );
@@ -1264,7 +1264,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier,
             m_pMyShell->clearError( nMyCommandIdentifier );
             m_aUncPath = getParentName( m_aUncPath );
             if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 )
-                m_aUncPath += rtl::OUString::createFromAscii("/");
+                m_aUncPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
             m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(),
                                             rtl_UriCharClassPchar,
diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx
index d17fcc646497..1c8e7eb63bfb 100644
--- a/ucb/source/ucp/file/filglob.cxx
+++ b/ucb/source/ucp/file/filglob.cxx
@@ -222,10 +222,10 @@ namespace fileaccess {
         rtl::OUString aParent = aFileName.copy( 0,lastIndex );
 
         if( aParent[ aParent.getLength()-1] == sal_Unicode(':') && aParent.getLength() == 6 )
-            aParent += rtl::OUString::createFromAscii( "/" );
+            aParent += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
         if( 0 == aParent.compareToAscii( "file://" ) )
-            aParent = rtl::OUString::createFromAscii( "file:///" );
+            aParent = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
 
         return aParent;
     }
@@ -536,8 +536,8 @@ namespace fileaccess {
             Sequence< ::rtl::OUString > aSeq( 1 );
             aSeq[0] =
                 ( errorCode == TASKHANDLING_NONAMESET_INSERT_COMMAND )  ?
-                rtl::OUString::createFromAscii( "Title" )               :
-                rtl::OUString::createFromAscii( "ContentType" );
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"))               :
+                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
 
             aAny <<= MissingPropertiesException(
                 rtl::OUString(
@@ -603,7 +603,7 @@ namespace fileaccess {
             InteractiveAugmentedIOException excep;
             excep.Code = IOErrorCode_INVALID_CHARACTER;
             PropertyValue prop;
-            prop.Name = rtl::OUString::createFromAscii("ResourceName");
+            prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
             prop.Handle = -1;
             rtl::OUString m_aClashingName(
                 rtl::Uri::decode(
diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx
index 2738151fbf8a..66ac700013e6 100644
--- a/ucb/source/ucp/file/filinsreq.cxx
+++ b/ucb/source/ucp/file/filinsreq.cxx
@@ -207,7 +207,7 @@ XInteractionRequestImpl::getRequest()
         InteractiveAugmentedIOException excep;
         excep.Code = IOErrorCode_INVALID_CHARACTER;
         PropertyValue prop;
-        prop.Name = rtl::OUString::createFromAscii("ResourceName");
+        prop.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ResourceName"));
         prop.Handle = -1;
         prop.Value <<= m_aClashingName;
         Sequence<Any> seq(1);
diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 31246a8f9771..4bd7954917ef 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -56,7 +56,7 @@ sal_Bool convert( shell* pShell,
         {
             xConverter = uno::Reference< script::XTypeConverter >(
                 pShell->m_xMultiServiceFactory->createInstance(
-                    rtl::OUString::createFromAscii( "com.sun.star.script.Converter" ) ),uno::UNO_QUERY );
+                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter")) ), uno::UNO_QUERY );
 
 /*          DBG_ASSERT( m_xTypeConverter.is(),
                         "PropertyValueSet::getTypeConverter() - "
diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index f2c3ec8e77ba..88b78ff61a1d 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -237,7 +237,7 @@ void XResultSet_impl::rowCountChanged()
         aOldValue = aNewValue-1;
     }
     beans::PropertyChangeEvent aEv;
-    aEv.PropertyName = rtl::OUString::createFromAscii( "RowCount" );
+    aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     aEv.Further = false;
     aEv.PropertyHandle = -1;
     aEv.OldValue <<= aOldValue;
@@ -262,7 +262,7 @@ void XResultSet_impl::isFinalChanged()
         m_bRowCountFinal = true;
     }
     beans::PropertyChangeEvent aEv;
-    aEv.PropertyName = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    aEv.PropertyName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     aEv.Further = false;
     aEv.PropertyHandle = -1;
     sal_Bool fval = false;
@@ -734,8 +734,8 @@ XResultSet_impl::connectToCache(
             xStubFactory
                 = uno::Reference< ucb::XCachedDynamicResultSetStubFactory >(
                     mxSMgr->createInstance(
-                        rtl::OUString::createFromAscii(
-                            "com.sun.star.ucb.CachedDynamicResultSetStubFactory" ) ),
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "com.sun.star.ucb.CachedDynamicResultSetStubFactory" )) ),
                     uno::UNO_QUERY );
         }
         catch ( uno::Exception const & )
@@ -806,12 +806,12 @@ XResultSet_impl::getPropertySetInfo()
 {
 
     uno::Sequence< beans::Property > seq(2);
-    seq[0].Name = rtl::OUString::createFromAscii( "RowCount" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount"));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Int32* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
 
-    seq[0].Name = rtl::OUString::createFromAscii( "IsRowCountFinal" );
+    seq[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal"));
     seq[0].Handle = -1;
     seq[0].Type = getCppuType( static_cast< sal_Bool* >(0) );
     seq[0].Attributes = beans::PropertyAttribute::READONLY;
@@ -831,8 +831,8 @@ void SAL_CALL XResultSet_impl::setPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) ||
-        aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) ||
+        aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
         return;
     throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), uno::Reference< uno::XInterface >() );
 }
@@ -844,13 +844,13 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( PropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         uno::Any aAny;
         aAny <<= m_bRowCountFinal;
         return aAny;
     }
-    else if ( PropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         uno::Any aAny;
         sal_Int32 count = sal::static_int_cast<sal_Int32>(m_aItems.size());
@@ -869,7 +869,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) )
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pIsFinalListeners )
@@ -878,7 +878,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener(
 
         m_pIsFinalListeners->addInterface( xListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) )
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) )
     {
         osl::MutexGuard aGuard( m_aMutex );
         if ( ! m_pRowCountListeners )
@@ -898,13 +898,13 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener(
            lang::WrappedTargetException,
            uno::RuntimeException)
 {
-    if( aPropertyName == rtl::OUString::createFromAscii( "IsRowCountFinal" ) &&
+    if( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsRowCountFinal")) &&
         m_pIsFinalListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
         m_pIsFinalListeners->removeInterface( aListener );
     }
-    else if ( aPropertyName == rtl::OUString::createFromAscii( "RowCount" ) &&
+    else if ( aPropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RowCount")) &&
               m_pRowCountListeners )
     {
         osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index d034538e47ff..6860acfeac41 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -303,8 +303,8 @@ XStream_impl::closeStream(
 
         if( err != osl::FileBase::E_None ) {
             io::IOException ex;
-            ex.Message = rtl::OUString::createFromAscii(
-                "could not close file");
+            ex.Message = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "could not close file"));
             throw ex;
         }
 
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index b167757eeac1..4292c5fefe87 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -56,9 +56,9 @@ static sal_Bool writeInfo( void * pRegistryKey,
                            const rtl::OUString & rImplementationName,
                               Sequence< rtl::OUString > const & rServiceNames )
 {
-    rtl::OUString aKeyName( rtl::OUString::createFromAscii( "/" ) );
+    rtl::OUString aKeyName( RTL_CONSTASCII_USTRINGPARAM("/") );
     aKeyName += rImplementationName;
-    aKeyName += rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+    aKeyName += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
     Reference< registry::XRegistryKey > xKey;
     try
@@ -263,7 +263,7 @@ FileProvider::supportsService(
                   const rtl::OUString& ServiceName )
   throw( RuntimeException )
 {
-  return ServiceName == rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" );
+  return ServiceName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider"));
 }
 
 
@@ -468,17 +468,17 @@ private:
 XPropertySetInfoImpl2::XPropertySetInfoImpl2()
     : m_seq( 3 )
 {
-    m_seq[0] = Property( rtl::OUString::createFromAscii( "HostName" ),
+    m_seq[0] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HostName")),
                          -1,
                          getCppuType( static_cast< rtl::OUString* >( 0 ) ),
                          PropertyAttribute::READONLY );
 
-    m_seq[1] = Property( rtl::OUString::createFromAscii( "HomeDirectory" ),
+    m_seq[1] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HomeDirectory")),
                          -1,
                          getCppuType( static_cast< rtl::OUString* >( 0 ) ),
                          PropertyAttribute::READONLY );
 
-    m_seq[2] = Property( rtl::OUString::createFromAscii( "FileSystemNotation" ),
+    m_seq[2] = Property( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileSystemNotation")),
                          -1,
                          getCppuType( static_cast< sal_Int32* >( 0 ) ),
                          PropertyAttribute::READONLY );
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index 6b5ad1357c11..250d58db9b7f 100644
--- a/ucb/source/ucp/file/shell.cxx
+++ b/ucb/source/ucp/file/shell.cxx
@@ -167,24 +167,24 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
       m_bWithConfig( bWithConfig ),
       m_pProvider( pProvider ),
       m_xMultiServiceFactory( xMultiServiceFactory ),
-      Title( rtl::OUString::createFromAscii( "Title" ) ),
+      Title( RTL_CONSTASCII_USTRINGPARAM("Title") ),
       CasePreservingURL(
-          rtl::OUString::createFromAscii( "CasePreservingURL" ) ),
-      IsDocument( rtl::OUString::createFromAscii( "IsDocument" ) ),
-      IsFolder( rtl::OUString::createFromAscii( "IsFolder" ) ),
-      DateModified( rtl::OUString::createFromAscii( "DateModified" ) ),
-      Size( rtl::OUString::createFromAscii( "Size" ) ),
-      IsVolume( rtl::OUString::createFromAscii( "IsVolume" ) ),
-      IsRemoveable( rtl::OUString::createFromAscii( "IsRemoveable" ) ),
-      IsRemote( rtl::OUString::createFromAscii( "IsRemote" ) ),
-      IsCompactDisc( rtl::OUString::createFromAscii( "IsCompactDisc" ) ),
-      IsFloppy( rtl::OUString::createFromAscii( "IsFloppy" ) ),
-      IsHidden( rtl::OUString::createFromAscii( "IsHidden" ) ),
-      ContentType( rtl::OUString::createFromAscii( "ContentType" ) ),
-      IsReadOnly( rtl::OUString::createFromAscii( "IsReadOnly" ) ),
-      CreatableContentsInfo( rtl::OUString::createFromAscii( "CreatableContentsInfo" ) ),
-      FolderContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ) ),
-      FileContentType( rtl::OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-file" ) ),
+          RTL_CONSTASCII_USTRINGPARAM("CasePreservingURL") ),
+      IsDocument( RTL_CONSTASCII_USTRINGPARAM("IsDocument") ),
+      IsFolder( RTL_CONSTASCII_USTRINGPARAM("IsFolder") ),
+      DateModified( RTL_CONSTASCII_USTRINGPARAM("DateModified") ),
+      Size( RTL_CONSTASCII_USTRINGPARAM("Size") ),
+      IsVolume( RTL_CONSTASCII_USTRINGPARAM("IsVolume") ),
+      IsRemoveable( RTL_CONSTASCII_USTRINGPARAM("IsRemoveable") ),
+      IsRemote( RTL_CONSTASCII_USTRINGPARAM("IsRemote") ),
+      IsCompactDisc( RTL_CONSTASCII_USTRINGPARAM("IsCompactDisc") ),
+      IsFloppy( RTL_CONSTASCII_USTRINGPARAM("IsFloppy") ),
+      IsHidden( RTL_CONSTASCII_USTRINGPARAM("IsHidden") ),
+      ContentType( RTL_CONSTASCII_USTRINGPARAM("ContentType") ),
+      IsReadOnly( RTL_CONSTASCII_USTRINGPARAM("IsReadOnly") ),
+      CreatableContentsInfo( RTL_CONSTASCII_USTRINGPARAM("CreatableContentsInfo") ),
+      FolderContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-folder") ),
+      FileContentType( RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.staroffice.fsys-file") ),
       m_sCommandInfo( 9 )
 {
     // Title
@@ -364,45 +364,45 @@ shell::shell( const uno::Reference< lang::XMultiServiceFactory >& xMultiServiceF
                                              | beans::PropertyAttribute::READONLY ) );
 
     // Commands
-    m_sCommandInfo[0].Name = rtl::OUString::createFromAscii( "getCommandInfo" );
+    m_sCommandInfo[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getCommandInfo"));
     m_sCommandInfo[0].Handle = -1;
     m_sCommandInfo[0].ArgType = getCppuVoidType();
 
-    m_sCommandInfo[1].Name = rtl::OUString::createFromAscii( "getPropertySetInfo" );
+    m_sCommandInfo[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertySetInfo"));
     m_sCommandInfo[1].Handle = -1;
     m_sCommandInfo[1].ArgType = getCppuVoidType();
 
-    m_sCommandInfo[2].Name = rtl::OUString::createFromAscii( "getPropertyValues" );
+    m_sCommandInfo[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("getPropertyValues"));
     m_sCommandInfo[2].Handle = -1;
     m_sCommandInfo[2].ArgType = getCppuType( static_cast< uno::Sequence< beans::Property >* >( 0 ) );
 
-    m_sCommandInfo[3].Name = rtl::OUString::createFromAscii( "setPropertyValues" );
+    m_sCommandInfo[3].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("setPropertyValues"));
     m_sCommandInfo[3].Handle = -1;
     m_sCommandInfo[3].ArgType = getCppuType( static_cast< uno::Sequence< beans::PropertyValue >* >( 0 ) );
 
-    m_sCommandInfo[4].Name = rtl::OUString::createFromAscii( "open" );
+    m_sCommandInfo[4].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("open"));
     m_sCommandInfo[4].Handle = -1;
     m_sCommandInfo[4].ArgType = getCppuType( static_cast< OpenCommandArgument* >( 0 ) );
 
-    m_sCommandInfo[5].Name = rtl::OUString::createFromAscii( "transfer" );
+    m_sCommandInfo[5].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("transfer"));
     m_sCommandInfo[5].Handle = -1;
     m_sCommandInfo[5].ArgType = getCppuType( static_cast< TransferInfo* >( 0 ) );
 
-    m_sCommandInfo[6].Name = rtl::OUString::createFromAscii( "delete" );
+    m_sCommandInfo[6].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("delete"));
     m_sCommandInfo[6].Handle = -1;
     m_sCommandInfo[6].ArgType = getCppuType( static_cast< sal_Bool* >( 0 ) );
 
-    m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "insert" );
+    m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("insert"));
     m_sCommandInfo[7].Handle = -1;
     m_sCommandInfo[7].ArgType = getCppuType( static_cast< InsertCommandArgument* > ( 0 ) );
 
-    m_sCommandInfo[7].Name = rtl::OUString::createFromAscii( "createNewContent" );
+    m_sCommandInfo[7].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("createNewContent"));
     m_sCommandInfo[7].Handle = -1;
     m_sCommandInfo[7].ArgType = getCppuType( static_cast< ucb::ContentInfo * > ( 0 ) );
 
     if(m_bWithConfig)
     {
-        rtl::OUString Store = rtl::OUString::createFromAscii( "com.sun.star.ucb.Store" );
+        rtl::OUString Store(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Store"));
         uno::Reference< XPropertySetRegistryFactory > xRegFac(
             m_xMultiServiceFactory->createInstance( Store ),
             uno::UNO_QUERY );
@@ -914,7 +914,7 @@ shell::setv( const rtl::OUString& aUnqPath,
                         --propChanged; // unsuccessful setting
                         uno::Sequence< uno::Any > names( 1 );
                         ret[0] <<= beans::PropertyValue(
-                            rtl::OUString::createFromAscii("Uri"), -1,
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                             uno::makeAny(aUnqPath),
                             beans::PropertyState_DIRECT_VALUE);
                         IOErrorCode ioError(IOErrorCode_GENERAL);
@@ -978,7 +978,7 @@ shell::setv( const rtl::OUString& aUnqPath,
                         --propChanged; // unsuccessful setting
                         uno::Sequence< uno::Any > names( 1 );
                         names[0] <<= beans::PropertyValue(
-                            rtl::OUString::createFromAscii("Uri"), -1,
+                            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")), -1,
                             uno::makeAny(aUnqPath),
                             beans::PropertyState_DIRECT_VALUE);
                         IOErrorCode ioError;
@@ -1208,7 +1208,7 @@ shell::move( sal_Int32 CommandId,
                 {
                     newDstUnqPath = dstUnqPath;
 
-                    rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+                    rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
                     aPostFix += rtl::OUString::valueOf( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1438,7 +1438,7 @@ shell::copy(
                 {
                     newDstUnqPath = dstUnqPath;
 
-                    rtl::OUString aPostFix( rtl::OUString::createFromAscii( "_" ) );
+                    rtl::OUString aPostFix( RTL_CONSTASCII_USTRINGPARAM("_") );
                     aPostFix += rtl::OUString::valueOf( ++nTry );
 
                     newDstUnqPath = newDstUnqPath.replaceAt( nPos, 0, aPostFix );
@@ -1981,7 +1981,7 @@ sal_Bool SAL_CALL shell::getUnqFromUrl( const rtl::OUString& Url,rtl::OUString&
         0 == Url.compareToAscii( "file://localhost/" ) ||
         0 == Url.compareToAscii( "file://127.0.0.1/" ) )
     {
-        Unq = rtl::OUString::createFromAscii( "file:///" );
+        Unq = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///"));
         return false;
     }
 
@@ -2062,7 +2062,7 @@ shell::copy_recursive( const rtl::OUString& srcUnqPath,
                                           RTL_TEXTENCODING_UTF8 );
 
                 if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 )
-                    newDstUnqPath += rtl::OUString::createFromAscii( "/" );
+                    newDstUnqPath += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
                 newDstUnqPath += tit;
 
@@ -3033,7 +3033,7 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
 
     uno::Sequence< beans::Property > props( 1 );
     props[0] = beans::Property(
-        rtl::OUString::createFromAscii( "Title" ),
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")),
         -1,
         getCppuType( static_cast< rtl::OUString* >( 0 ) ),
         beans::PropertyAttribute::MAYBEVOID
@@ -3056,20 +3056,20 @@ uno::Sequence< ucb::ContentInfo > shell::queryCreatableContentsInfo()
 void SAL_CALL
 shell::getScheme( rtl::OUString& Scheme )
 {
-  Scheme = rtl::OUString::createFromAscii( "file" );
+  Scheme = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file"));
 }
 
 rtl::OUString SAL_CALL
 shell::getImplementationName_static( void )
 {
-  return rtl::OUString::createFromAscii( "com.sun.star.comp.ucb.FileProvider" );
+  return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.ucb.FileProvider"));
 }
 
 
 uno::Sequence< rtl::OUString > SAL_CALL
 shell::getSupportedServiceNames_static( void )
 {
-  rtl::OUString Supported = rtl::OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ) ;
+  rtl::OUString Supported(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.FileContentProvider"));
   com::sun::star::uno::Sequence< rtl::OUString > Seq( &Supported,1 );
   return Seq;
 }