RTL_CONSTASCII_USTRINGPARAM in libs-gui 02

7 files changed, 23 insertions, 23 deletions

diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 8439040a6337..48f60629905a 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -68,7 +68,7 @@ namespace
     Sequence< OUString > SAL_CALL WinClipboard_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.clipboard.SystemClipboard");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.clipboard.SystemClipboard"));
         return aRet;
     }
 }
@@ -102,7 +102,7 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -122,7 +122,7 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -136,13 +136,13 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
 OUString SAL_CALL CWinClipboard::getName(  ) throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
         return m_pImpl->getName( );
 
-    return OUString::createFromAscii( "" );
+    return OUString(RTL_CONSTASCII_USTRINGPARAM(""));
 }
 
 //========================================================================
@@ -154,7 +154,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
     MutexGuard aGuard( m_aMutex );
 
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -168,7 +168,7 @@ void SAL_CALL CWinClipboard::flushClipboard( ) throw( RuntimeException )
 sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     if ( NULL != m_pImpl.get( ) )
@@ -189,12 +189,12 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     // check input parameter
     if ( !listener.is( ) )
-        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ),
+        throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
@@ -209,12 +209,12 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
     throw( RuntimeException )
 {
     if ( rBHelper.bDisposed )
-        throw DisposedException( OUString::createFromAscii( "object is already disposed" ),
+        throw DisposedException( OUString(RTL_CONSTASCII_USTRINGPARAM("object is already disposed")),
                                  static_cast< XClipboardEx* >( this ) );
 
     // check input parameter
     if ( !listener.is( ) )
-        throw IllegalArgumentException( OUString::createFromAscii( "empty reference" ),
+        throw IllegalArgumentException( OUString(RTL_CONSTASCII_USTRINGPARAM("empty reference")),
                                         static_cast< XClipboardEx* >( this ),
                                         1 );
 
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 5c051da5678d..11d963da3093 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -502,7 +502,7 @@ sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
     if ( !m_rXMimeCntFactory.is( ) )
     {
         m_rXMimeCntFactory = Reference< XMimeContentTypeFactory >( m_SrvMgr->createInstance(
-            OUString::createFromAscii( "com.sun.star.datatransfer.MimeContentTypeFactory" ) ), UNO_QUERY );
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.MimeContentTypeFactory")) ), UNO_QUERY );
     }
     OSL_ASSERT( m_rXMimeCntFactory.is( ) );
 
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index c832a7a24996..6ed4450333f4 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -77,11 +77,11 @@ const Type       CPPUTYPE_OUSTRING   = getCppuType((OUString*)0);
 const Type       CPPUTYPE_SEQSALINT8 = getCppuType((Sequence< sal_Int8>*)0);
 const sal_Int32  MAX_CLIPFORMAT_NAME = 256;
 
-const OUString TEXT_PLAIN_CHARSET   = OUString::createFromAscii( "text/plain;charset=" );
-const OUString HPNAME_OEM_ANSI_TEXT = OUString::createFromAscii( "OEM/ANSI Text" );
+const OUString TEXT_PLAIN_CHARSET   (RTL_CONSTASCII_USTRINGPARAM("text/plain;charset="));
+const OUString HPNAME_OEM_ANSI_TEXT (RTL_CONSTASCII_USTRINGPARAM("OEM/ANSI Text"));
 
-const OUString HTML_FORMAT_NAME_WINDOWS = OUString::createFromAscii( "HTML Format" );
-const OUString HTML_FORMAT_NAME_SOFFICE = OUString::createFromAscii( "HTML (HyperText Markup Language)" );
+const OUString HTML_FORMAT_NAME_WINDOWS (RTL_CONSTASCII_USTRINGPARAM("HTML Format"));
+const OUString HTML_FORMAT_NAME_SOFFICE (RTL_CONSTASCII_USTRINGPARAM("HTML (HyperText Markup Language)"));
 
 //------------------------------------------------------------------------
 //
@@ -91,7 +91,7 @@ CDataFormatTranslator::CDataFormatTranslator( const Reference< XMultiServiceFact
     m_SrvMgr( aServiceManager )
 {
     m_XDataFormatTranslator = Reference< XDataFormatTranslator >(
-        m_SrvMgr->createInstance( OUString::createFromAscii( "com.sun.star.datatransfer.DataFormatTranslator" ) ), UNO_QUERY );
+        m_SrvMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.DataFormatTranslator")) ), UNO_QUERY );
 }
 
 //------------------------------------------------------------------------
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 2364a0a14341..98f88db21ea0 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -283,7 +283,7 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
                 aFormatEtcContainer.addFormatEtc( fetc );
 
                 // and HTML Format
-                OUString htmlFormat( OUString::createFromAscii( "HTML Format" ) );
+                OUString htmlFormat( RTL_CONSTASCII_USTRINGPARAM("HTML Format") );
                 aFormatEtcContainer.addFormatEtc(
                     m_DataFormatTranslator.getFormatEtcForClipformatName( htmlFormat ) );
             }
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 16c0e0f0afd0..f2e1fd579f8e 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -454,7 +454,7 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
     DataFlavor aFlavor;
 
     // creating a DataFlavor on the fly
-    aFlavor.MimeType = OUString::createFromAscii( "text/html" );
+    aFlavor.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
     aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
 
     Any aAny = m_XTransferable->getTransferData( aFlavor );
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index e27cefcc3f22..e7db01af1cb4 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -60,10 +60,10 @@
 #define CPPUTYPE_SALINT32         getCppuType( ( sal_Int32 * ) 0 )
 #define OUSTR( str )              OUString::createFromAscii( #str )
 #define OUSTR_( str )             OUString::createFromAscii( str )
-#define EMPTY_OUSTR               OUString::createFromAscii( "" )
+#define EMPTY_OUSTR               OUString(RTL_CONSTASCII_USTRINGPARAM(""))
 //#define PRIVATE_OO                  OUString::createFromAscii( "application/x-openoffice;" "windows_formatname=" )
 
-const rtl::OUString Windows_FormatName = rtl::OUString::createFromAscii("windows_formatname");
+const rtl::OUString Windows_FormatName (RTL_CONSTASCII_USTRINGPARAM("windows_formatname"));
 const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
 const com::sun::star::uno::Type CppuType_String       = ::getCppuType((const ::rtl::OUString*)0);
 
@@ -89,7 +89,7 @@ namespace MODULE_PRIVATE
     Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( )
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = OUString::createFromAscii("com.sun.star.datatransfer.DataFormatTranslator");
+        aRet[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.datatransfer.DataFormatTranslator"));
         return aRet;
     }
 }
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 65118eed7fbd..ccfff019f461 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -168,7 +168,7 @@ private:
 
 CTransferable::CTransferable( ) :
     m_FlavorList( 1 ),
-    m_Data( OUString::createFromAscii( "Ich habe mir ein neues Fahrrad gekauft!" ) )
+    m_Data( OUString(RTL_CONSTASCII_USTRINGPARAM("Ich habe mir ein neues Fahrrad gekauft!")) )
 {
     DataFlavor df;