EasyHack: RTL conversion from createFromAscii

comphelper/source/compare/AnyCompareFactory.cxx

@@ -65,7 +65,7 @@ public:
         if ( xFactory.is() )
     {
         m_rCollator = Reference< XCollator >(
-                xFactory->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.i18n.Collator" ), xContext ),
+                xFactory->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.Collator" )), xContext ),
                         UNO_QUERY );
         m_rCollator->loadDefaultCollator( rLocale,
                                           0 ); //???
@@ -133,7 +133,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con
     // for now only OUString properties compare is implemented
     // so no check for the property name is done
 
-    if( aPropertyName.equals( OUString::createFromAscii( "Title" ) ) )
+    if( aPropertyName.equals( OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" )) ) )
         return m_rAnyCompare;
 
     return Reference< XAnyCompare >();

comphelper/source/eventattachermgr/eventattachermgr.cxx

@@ -381,7 +381,7 @@ Reference< XEventAttacherManager > createEventAttacherManager( const Reference<
 {
     if ( rSMgr.is() )
     {
-        Reference< XInterface > xIFace( rSMgr->createInstance( OUString::createFromAscii("com.sun.star.beans.Introspection") ) );
+        Reference< XInterface > xIFace( rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.beans.Introspection" )) ) );
         if ( xIFace.is() )
         {
             Reference< XIntrospection > xIntrospection( xIFace, UNO_QUERY);
@@ -401,12 +401,12 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect
 {
     if ( rSMgr.is() )
     {
-        Reference< XInterface > xIFace( rSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.EventAttacher") ) );
+        Reference< XInterface > xIFace( rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.EventAttacher" )) ) );
         if ( xIFace.is() )
         {
             xAttacher = Reference< XEventAttacher >::query( xIFace );
         }
-        xIFace = rSMgr->createInstance( OUString::createFromAscii("com.sun.star.script.Converter") );
+        xIFace = rSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.script.Converter" )) );
         if ( xIFace.is() )
         {
             xConverter = Reference< XTypeConverter >::query( xIFace );
@@ -433,7 +433,7 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exc
     // Haben wir den Service schon? Sonst anlegen
     if( !mxCoreReflection.is() )
     {
-        Reference< XInterface > xIFace( mxSMgr->createInstance( OUString::createFromAscii("com.sun.star.reflection.CoreReflection") ) );
+        Reference< XInterface > xIFace( mxSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.reflection.CoreReflection" )) ) );
         mxCoreReflection = Reference< XIdlReflection >( xIFace, UNO_QUERY);
     }
     return mxCoreReflection;

comphelper/source/misc/mediadescriptor.cxx

@@ -419,8 +419,8 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::NamedValu
 -----------------------------------------------*/
 sal_Bool MediaDescriptor::isStreamReadOnly() const
 {
-    static ::rtl::OUString CONTENTSCHEME_FILE     = ::rtl::OUString::createFromAscii("file");
-    static ::rtl::OUString CONTENTPROP_ISREADONLY = ::rtl::OUString::createFromAscii("IsReadOnly");
+    static ::rtl::OUString CONTENTSCHEME_FILE(     RTL_CONSTASCII_USTRINGPARAM( "file" ));
+    static ::rtl::OUString CONTENTPROP_ISREADONLY( RTL_CONSTASCII_USTRINGPARAM( "IsReadOnly" ));
     static sal_Bool        READONLY_FALLBACK      = sal_False;
 
     sal_Bool bReadOnly = READONLY_FALLBACK;
@@ -591,7 +591,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
         ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
         if (!sURL.getLength())
             throw css::uno::Exception(
-                    ::rtl::OUString::createFromAscii("Found no URL."),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found no URL." )),
                     css::uno::Reference< css::uno::XInterface >());
 
         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
@@ -622,7 +622,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
 {
     if ( !_rxPostData.is() )
         throw css::lang::IllegalArgumentException(
-                ::rtl::OUString::createFromAscii("Found invalid PostData."),
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found invalid PostData." )),
                 css::uno::Reference< css::uno::XInterface >(), 1);
 
     // PostData can't be used in read/write mode!
@@ -640,7 +640,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
     ::rtl::OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), ::rtl::OUString());
     if (!sMediaType.getLength())
     {
-        sMediaType = ::rtl::OUString::createFromAscii("application/x-www-form-urlencoded");
+        sMediaType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/x-www-form-urlencoded" ));
         (*this)[MediaDescriptor::PROP_MEDIATYPE()] <<= sMediaType;
     }
 
@@ -842,7 +842,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const ::rtl::OUString& sURL, s
        it parses the URL in another way. It's main part isnt enough
        and it's complete part contains the jumpmark (fragment) parameter ...
     */
-    static ::rtl::OUString SERVICENAME_URIREFERENCEFACTORY = ::rtl::OUString::createFromAscii("com.sun.star.uri.UriReferenceFactory");
+    static ::rtl::OUString SERVICENAME_URIREFERENCEFACTORY( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.uri.UriReferenceFactory" ));
 
     try
     {

comphelper/source/misc/numbers.cxx

@@ -53,7 +53,7 @@ sal_Int16 getNumberFormatType(const staruno::Reference<starutil::XNumberFormats>
         {
             staruno::Reference<starbeans::XPropertySet> xFormat(xFormats->getByKey(nKey));
             if (xFormat.is())
-                xFormat->getPropertyValue(rtl::OUString::createFromAscii("Type")) >>= nReturn;
+                xFormat->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Type" ))) >>= nReturn;
         }
         catch(...)
         {
@@ -83,7 +83,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF
             staruno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
             if (xFormat.is())
             {
-                static ::rtl::OUString PROPERTY_DECIMALS = ::rtl::OUString::createFromAscii("Decimals");
+                static ::rtl::OUString PROPERTY_DECIMALS( RTL_CONSTASCII_USTRINGPARAM( "Decimals" ));
                 return xFormat->getPropertyValue(PROPERTY_DECIMALS);
             }
         }

comphelper/source/misc/officerestartmanager.cxx

@@ -104,7 +104,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task:
 
         uno::Reference< awt::XRequestCallback > xRequestCallback(
             xFactory->createInstanceWithContext(
-                 ::rtl::OUString::createFromAscii("com.sun.star.awt.AsyncCallback"),
+                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.AsyncCallback" )),
                  m_xContext ),
              uno::UNO_QUERY_THROW );
 

comphelper/source/misc/regpathhelper.cxx

@@ -72,7 +72,7 @@ static sal_Bool retrievePortalUserDir( OUString *pDirectory )
     {
         if ( !osl_getCommandArg(--nArgs, &sArg.pData) )
         {
-            if ( sArg.indexOf(OUString::createFromAscii("-userid")) == 0 )
+            if ( sArg.indexOf(OUString( RTL_CONSTASCII_USTRINGPARAM( "-userid" ))) == 0 )
             {
 
                 bIsPortalUser = sal_True;

comphelper/source/misc/sequenceashashmap.cxx

@@ -115,7 +115,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Any& aSource)
     }
 
     throw css::beans::IllegalTypeException(
-            ::rtl::OUString::createFromAscii("Any contains wrong type."),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Any contains wrong type." )),
             css::uno::Reference< css::uno::XInterface >());
 }
 
@@ -135,7 +135,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 (!lP.Value.hasValue())
                )
                 throw css::beans::IllegalTypeException(
-                        ::rtl::OUString::createFromAscii("PropertyValue struct contains no usefull informations."),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PropertyValue struct contains no usefull informations." )),
                         css::uno::Reference< css::uno::XInterface >());
             (*this)[lP.Name] = lP.Value;
             continue;
@@ -149,7 +149,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
                 (!lN.Value.hasValue())
                )
                 throw css::beans::IllegalTypeException(
-                        ::rtl::OUString::createFromAscii("NamedValue struct contains no usefull informations."),
+                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NamedValue struct contains no usefull informations." )),
                         css::uno::Reference< css::uno::XInterface >());
             (*this)[lN.Name] = lN.Value;
             continue;
@@ -158,7 +158,7 @@ void SequenceAsHashMap::operator<<(const css::uno::Sequence< css::uno::Any >& lS
         // ignore VOID Any ... but reject wrong filled ones!
         if (lSource[i].hasValue())
             throw css::beans::IllegalTypeException(
-                    ::rtl::OUString::createFromAscii("Any contains wrong type."),
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Any contains wrong type." )),
                     css::uno::Reference< css::uno::XInterface >());
     }
 }

comphelper/source/misc/storagehelper.cxx

@@ -58,7 +58,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory(
         throw uno::RuntimeException();
 
     uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.StorageFactory" ) ),
+                    xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.StorageFactory" )) ),
                     uno::UNO_QUERY );
 
     if ( !xStorageFactory.is() )
@@ -77,7 +77,7 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora
         throw uno::RuntimeException();
 
     uno::Reference < lang::XSingleServiceFactory > xStorageFactory(
-                    xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.embed.FileSystemStorageFactory" ) ),
+                    xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.embed.FileSystemStorageFactory" )) ),
                     uno::UNO_QUERY );
 
     if ( !xStorageFactory.is() )
@@ -223,7 +223,7 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
         throw uno::RuntimeException();
 
     uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess(
-            xFactory->createInstance ( ::rtl::OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ) ),
+            xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ),
             uno::UNO_QUERY );
 
     if ( !xTempAccess.is() )
@@ -257,7 +257,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
     uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW );
 
     ::rtl::OUString aMediaType;
-    xStorProps->getPropertyValue( ::rtl::OUString::createFromAscii( "MediaType" ) ) >>= aMediaType;
+    xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaType" )) ) >>= aMediaType;
 
     sal_Int32 nResult = 0;
 

comphelper/source/misc/string.cxx

@@ -101,7 +101,7 @@ rtl::OUString searchAndReplaceAsciiL(
     ::comphelper::intersperse(
         ::comphelper::stl_begin(i_rSeq), ::comphelper::stl_end(i_rSeq),
         ::comphelper::OUStringBufferAppender(buf),
-        ::rtl::OUString::createFromAscii(", "));
+        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ", " )));
     return buf.makeStringAndClear();
 }
 

comphelper/source/property/propertystatecontainer.cxx

@@ -248,7 +248,7 @@ namespace comphelper
         :OPropertyStateContainer( GetBroadcastHelper() )
     {
         registerProperty(
-            ::rtl::OUString::createFromAscii( "StringProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StringProperty" )),
             1,
             PropertyAttribute::BOUND,
             &m_sStringProperty,
@@ -256,7 +256,7 @@ namespace comphelper
         );
 
         registerProperty(
-            ::rtl::OUString::createFromAscii( "InterfaceProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InterfaceProperty" )),
             2,
             PropertyAttribute::BOUND,
             &m_xInterfaceProperty,
@@ -264,7 +264,7 @@ namespace comphelper
         );
 
         registerMayBeVoidProperty(
-            ::rtl::OUString::createFromAscii( "IntProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IntProperty" )),
             3,
             PropertyAttribute::BOUND,
             &m_aMayBeVoidProperty,
@@ -272,7 +272,7 @@ namespace comphelper
         );
 
         registerPropertyNoMember(
-            ::rtl::OUString::createFromAscii( "OtherInterfaceProperty" ),
+            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OtherInterfaceProperty" )),
             4,
             PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
             ::getCppuType( static_cast< Reference< XInterface >* >( NULL ) ),

comphelper/test/uno_iterators/uno_iterators.cxx

@@ -135,7 +135,7 @@ void stl_conversions()
     // convert to stl::vector, modify in vector, copy back, print
     cout << "vector conversion" << endl;
     vector<OUString> vec(stl_s.begin(), stl_s.end());
-    vec[2] = OUString::createFromAscii("changed in vector");
+    vec[2] = OUString( RTL_CONSTASCII_USTRINGPARAM( "changed in vector" ));
     copy(vec.begin(), vec.end(), stl_s.begin());
     print_sequence(s);
 
@@ -143,7 +143,7 @@ void stl_conversions()
     cout << "list conversion" << endl;
     list<OUString> l(stl_s.begin(), stl_s.end());
     l.pop_back();
-    l.push_back(OUString::createFromAscii("changed in list"));
+    l.push_back(OUString( RTL_CONSTASCII_USTRINGPARAM( "changed in list" )));
     copy(l.begin(), l.end(), stl_s.begin());
     print_sequence(s);
 }
@@ -174,7 +174,7 @@ void stl_compare()
     StlUnoSequence<OUString> stl_s2 = StlUnoSequence<OUString>::createInstance(s2);
     if (stl_s1 == stl_s2)
         cout << "sequences are equal." << endl;
-    s2[9] = OUString::createFromAscii("ZZZZZ");
+    s2[9] = OUString( RTL_CONSTASCII_USTRINGPARAM( "ZZZZZ" ));
     if(stl_s1 < stl_s2)
         cout << "first sequence is smaller." << endl;
 }