[Libreoffice-commits] .: unotools/source

[Gert Faller]

 unotools/source/config/confignode.cxx      |    7 +++----
 unotools/source/config/docinfohelper.cxx   |    4 ++--
 unotools/source/ucbhelper/ucblockbytes.cxx |   10 +++++-----
 3 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 3efd0cfe3a481fd4c02c1f563f2cbe484e0e7aaa
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date:   Thu Nov 25 22:07:17 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM in libs-gui 20

diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index b261275..a6dc5c1 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -530,10 +530,9 @@ namespace utl
                 aArgs.put( "lazywrite", i_bLazyWrite );
                 aArgs.put( "depth", i_nDepth );
 
-                ::rtl::OUString sAccessService = ::rtl::OUString::createFromAscii(
-                        i_bUpdatable
-                    ? "com.sun.star.configuration.ConfigurationUpdateAccess"
-                    : "com.sun.star.configuration.ConfigurationAccess" );
+                ::rtl::OUString sAccessService( i_bUpdatable ?
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationUpdateAccess" )) :
+                                ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )));
 
                 Reference< XInterface > xRoot(
                     i_rxConfigProvider->createInstanceWithArguments( sAccessService, aArgs.getWrappedPropertyValues() ),
diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index 2e49b3c..d2af850 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -72,8 +72,8 @@ namespace utl
         }
 
         aResult.append( (sal_Unicode)'$' );
-        aResult.append( ::rtl::OUString::createFromAscii(
-                                TOOLS_INETDEF_OS ).replace( ' ', '_' ) );
+        aResult.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                                TOOLS_INETDEF_OS )).replace( ' ', '_' ) );
 
         aResult.append( (sal_Unicode)' ' );
     }
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 053354f..bbf70a7 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -201,7 +201,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
     for (i = 0; i < n; i++)
     {
         PropertyChangeEvent evt (rEvent[i]);
-        if (evt.PropertyName == ::rtl::OUString::createFromAscii ("DocumentHeader"))
+        if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("DocumentHeader")))
         {
             Sequence<DocumentHeaderField> aHead;
             if (evt.NewValue >>= aHead)
@@ -226,12 +226,12 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
 
             m_xLockBytes->SetStreamValid_Impl();
         }
-        else if (evt.PropertyName == rtl::OUString::createFromAscii ("PresentationURL"))
+        else if (evt.PropertyName == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("PresentationURL")))
         {
             ::rtl::OUString aUrl;
             if (evt.NewValue >>= aUrl)
             {
-                ::rtl::OUString aBad (::rtl::OUString::createFromAscii ("private:"));
+                ::rtl::OUString aBad (RTL_CONSTASCII_USTRINGPARAM ("private:"));
                 if (!(aUrl.compareTo (aBad, aBad.getLength()) == 0))
                 {
                     // URL changed (Redirection).
@@ -239,7 +239,7 @@ void SAL_CALL UcbPropertiesChangeListener_Impl::propertiesChange ( const Sequenc
                 }
             }
         }
-        else if (evt.PropertyName == ::rtl::OUString::createFromAscii ("MediaType"))
+        else if (evt.PropertyName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("MediaType")))
         {
             ::rtl::OUString aContentType;
             if (evt.NewValue >>= aContentType)
@@ -1667,7 +1667,7 @@ UcbLockBytesRef UcbLockBytes::CreateLockBytes( const Reference < XContent >& xCo
     aArgument.Referer = rReferer;
 
     Command aCommand;
-    aCommand.Name = ::rtl::OUString::createFromAscii ("post");
+    aCommand.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("post"));
     aCommand.Argument <<= aArgument;
 
     Reference< XProgressHandler > xProgressHdl = new ProgressHandler_Impl( LINK( &xLockBytes, UcbLockBytes, DataAvailHdl ) );