RTL_CONSTASCII_USTRINGPARAM in extensions 1

35 files changed, 172 insertions, 172 deletions

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index ac601e24465a..141ab7b3f863 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -135,7 +135,7 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
     // parse url. Url has the following format:
     // external server: sdbc:mysqlc:[hostname]:[port]/[dbname]
 
-    if (!url.compareTo(OUString::createFromAscii(MYSQLC_URI_PREFIX), sizeof(MYSQLC_URI_PREFIX)-1)) {
+    if (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM(MYSQLC_URI_PREFIX)), sizeof(MYSQLC_URI_PREFIX)-1)) {
         nIndex = 12;
     } else {
         bEmbedded = sal_True;
diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx
index 6b77cd94b2e2..1dd1fdbf9dff 100644
--- a/mysqlc/source/mysqlc_driver.cxx
+++ b/mysqlc/source/mysqlc_driver.cxx
@@ -102,7 +102,7 @@ Sequence< OUString > MysqlCDriver::getSupportedServiceNames_Static()
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
     Sequence< OUString > aSNS(1);
-    aSNS[0] = OUString::createFromAscii("com.sun.star.sdbc.Driver");
+    aSNS[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver"));
     return aSNS;
 }
 /* }}} */
@@ -152,7 +152,7 @@ void MysqlCDriver::impl_initCppConn_lck_throw()
 #else
     if ( !m_bAttemptedLoadCppConn )
     {
-        const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( CPPCONN_LIB );
+        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( CPPCONN_LIB ));
         m_hCppConnModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
         m_bAttemptedLoadCppConn = true;
     }
@@ -243,7 +243,7 @@ sal_Bool SAL_CALL MysqlCDriver::acceptsURL(const OUString& url)
         throw(SQLException, RuntimeException)
 {
     OSL_TRACE("MysqlCDriver::acceptsURL");
-    return (!url.compareTo(OUString::createFromAscii("sdbc:mysqlc:"), sizeof("sdbc:mysqlc:")-1));
+    return (!url.compareTo(OUString(RTL_CONSTASCII_USTRINGPARAM("sdbc:mysqlc:")), sizeof("sdbc:mysqlc:")-1));
 }
 /* }}} */
 
@@ -260,14 +260,14 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const OUSt
                 OUString(RTL_CONSTASCII_USTRINGPARAM("Hostname"))
                 ,OUString(RTL_CONSTASCII_USTRINGPARAM("Name of host"))
                 ,sal_True
-                ,OUString::createFromAscii("localhost")
+                ,OUString(RTL_CONSTASCII_USTRINGPARAM("localhost"))
                 ,Sequence< OUString >())
             );
         aDriverInfo.push_back(DriverPropertyInfo(
                 OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
                 ,OUString(RTL_CONSTASCII_USTRINGPARAM("Port"))
                 ,sal_True
-                ,OUString::createFromAscii("3306")
+                ,OUString(RTL_CONSTASCII_USTRINGPARAM("3306"))
                 ,Sequence< OUString >())
             );
         return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
diff --git a/sdext/source/minimizer/graphiccollector.cxx b/sdext/source/minimizer/graphiccollector.cxx
index d4258e66953c..5a9d94524c93 100644
--- a/sdext/source/minimizer/graphiccollector.cxx
+++ b/sdext/source/minimizer/graphiccollector.cxx
@@ -74,7 +74,7 @@ const DeviceInfo& GraphicCollector::GetDeviceInfo( const Reference< XComponentCo
 void ImpAddEntity( std::vector< GraphicCollector::GraphicEntity >& rGraphicEntities, Reference< XGraphic >& rxGraphic, const GraphicSettings& rGraphicSettings, const GraphicCollector::GraphicUser& rUser )
 {
     const rtl::OUString aGraphicURL( rUser.maGraphicURL );
-    const rtl::OUString sPackageURL( OUString::createFromAscii( "vnd.sun.star.GraphicObject:" ) );
+    const rtl::OUString sPackageURL( RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.GraphicObject:") );
 
     if ( rGraphicSettings.mbEmbedLinkedGraphics || ( !aGraphicURL.getLength() || aGraphicURL.match( sPackageURL, 0 ) ) )
     {
diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx
index d2e00fb94f26..01e0505bac9e 100644
--- a/sdext/source/minimizer/impoptimizer.cxx
+++ b/sdext/source/minimizer/impoptimizer.cxx
@@ -351,9 +351,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
                             }
                             if ( bNeedsOptimizing && aDestSizePixel.Width && aDestSizePixel.Height )
                             {
-                                Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW );
+                                Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW );
                                 Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
-                                Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW );
+                                Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW );
 
                                 ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, bRemoveCropArea, aGraphicCropLogic );
                                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
@@ -371,9 +371,9 @@ Reference< XGraphic > ImpCompressGraphic( const Reference< XComponentContext >&
             else // this is a metafile
             {
                 rtl::OUString aDestMimeType( aSourceMimeType );
-                Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), rxMSF ), UNO_QUERY_THROW );
+                Reference< XStream > xTempFile( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), rxMSF ), UNO_QUERY_THROW );
                 Reference< XOutputStream > xOutputStream( xTempFile->getOutputStream() );
-                Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), rxMSF ), UNO_QUERY_THROW );
+                Reference< XGraphicProvider > xGraphicProvider( rxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), rxMSF ), UNO_QUERY_THROW );
                 ImpCompressGraphic( xGraphicProvider, xGraphic, xOutputStream, aDestMimeType, aLogicalSize, rGraphicSettings.mnJPEGQuality, rGraphicSettings.mnImageResolution, sal_False, aGraphicCropLogic );
                 Reference< XInputStream > xInputStream( xTempFile->getInputStream() );
                 Reference< XSeekable > xSeekable( xInputStream, UNO_QUERY_THROW );
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 17413cef1ec9..f7faf8c29347 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -215,15 +215,15 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
     rtl::OUString sURL;
     try
     {
-        mxTempFile = Reference< XStream >( mxMSF->getServiceManager()->createInstanceWithContext( OUString::createFromAscii( "com.sun.star.io.TempFile" ), mxMSF ), UNO_QUERY_THROW );
+        mxTempFile = Reference< XStream >( mxMSF->getServiceManager()->createInstanceWithContext( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.TempFile")), mxMSF ), UNO_QUERY_THROW );
         Reference< XPropertySet > xPropSet( mxTempFile, UNO_QUERY );
         Reference< XOutputStream > xOutputStream( mxTempFile->getOutputStream() );
         if ( xOutputStream.is() && xPropSet.is() )
         {
             Reference< graphic::XGraphicProvider > xGraphicProvider( mxMSF->getServiceManager()->createInstanceWithContext(
-                        OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ), mxMSF ), UNO_QUERY_THROW );
+                        OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")), mxMSF ), UNO_QUERY_THROW );
             Sequence< PropertyValue > aArgs( 1 );
-            aArgs[ 0 ].Name = OUString::createFromAscii( "URL" );
+            aArgs[ 0 ].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
             aArgs[ 0 ].Value <<= sPrivateURL;
             Reference< graphic::XGraphic > xGraphic( xGraphicProvider->queryGraphic( aArgs ) );
             if ( xGraphic.is() )
@@ -236,7 +236,7 @@ OUString InformationDialog::ImpGetStandardImage( const OUString& sPrivateURL )
                 aArgs2[ 1 ].Value <<= xOutputStream;
                 xGraphicProvider->storeGraphic( xGraphic, aArgs2 );
             }
-            xPropSet->getPropertyValue( OUString::createFromAscii( "Uri" ) ) >>= sURL;
+            xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Uri")) ) >>= sURL;
         }
     }
     catch( Exception& )
@@ -322,7 +322,7 @@ void InformationDialog::InitDialog()
     OUString aInfoString( getString( eInfoString ) );
     const OUString aOldSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%OLDFILESIZE" ) );
     const OUString aNewSizePlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%NEWFILESIZE" ) );
-    const OUString aTitlePlaceholder( aTitle.getLength() ? OUString::createFromAscii( "%TITLE" ) : OUString::createFromAscii( "'%TITLE'" ) );
+    const OUString aTitlePlaceholder( aTitle.getLength() ? RTL_CONSTASCII_USTRINGPARAM("%TITLE") : RTL_CONSTASCII_USTRINGPARAM("'%TITLE'") );
 
     sal_Int32 i = aInfoString.indexOf( aOldSizePlaceholder, 0 );
     if ( i >= 0 )
@@ -337,11 +337,11 @@ void InformationDialog::InitDialog()
         aInfoString = aInfoString.replaceAt( k, aTitlePlaceholder.getLength(), aTitle );
 
     com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > xItemListener;
-    InsertImage( *this, rtl::OUString( rtl::OUString::createFromAscii( "aboutimage" ) ), ImpGetStandardImage( rtl::OUString::createFromAscii( "private:standardimage/query" ) ), 5, 5, 25, 25 );
-    InsertFixedText( *this, rtl::OUString( rtl::OUString::createFromAscii( "fixedtext" ) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
+    InsertImage( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("aboutimage")) ), ImpGetStandardImage( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:standardimage/query")) ), 5, 5, 25, 25 );
+    InsertFixedText( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("fixedtext")) ), aInfoString, PAGE_POS_X, 6, PAGE_WIDTH, 24, sal_True, 0 );
     if ( maSaveAsURL.getLength() )
         InsertCheckBox(  *this, TKGet( TK_OpenNewDocument ), xItemListener, getString( STR_AUTOMATICALLY_OPEN ), PAGE_POS_X, 42, PAGE_WIDTH, 8, 1 );
-    InsertButton( *this, rtl::OUString( rtl::OUString::createFromAscii( "button" ) ), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
+    InsertButton( *this, rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ), mxActionListener, DIALOG_WIDTH / 2 - 25, nDialogHeight - 20, 50, 14, 2, STR_OK );
 
     sal_Bool bOpenNewDocument = mrbOpenNewDocument;
     setControlProperty( TKGet( TK_OpenNewDocument ), TKGet( TK_State ), Any( (sal_Int16)bOpenNewDocument ) );
@@ -399,7 +399,7 @@ sal_Bool InformationDialog::execute()
 void OKActionListener::actionPerformed( const ActionEvent& rEvent )
     throw ( com::sun::star::uno::RuntimeException )
 {
-    if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString::createFromAscii( "button" ) ) )
+    if ( rEvent.ActionCommand == rtl::OUString( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("button")) ) )
     {
         mrInformationDialog.endExecute( sal_True );
     }
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index dc6532460dbe..aff500230021 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -129,8 +129,8 @@ void OptimizerDialog::InitRoadmap()
         InsertRoadmapItem( 4, sal_True, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
 
         rtl::OUString sBitmapPath( getPath( TK_BitmapPath ) );
-        rtl::OUString sBitmap( isHighContrast() ? rtl::OUString::createFromAscii( "/minimizepresi_80_h.png" )
-                                                : rtl::OUString::createFromAscii( "/minimizepresi_80.png" ) );
+        rtl::OUString sBitmap( isHighContrast() ? RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80_h.png")
+                                                : RTL_CONSTASCII_USTRINGPARAM("/minimizepresi_80.png") );
         rtl::OUString sURL( sBitmapPath += sBitmap );
 
         xPropertySet->setPropertyValue( TKGet( TK_ImageURL ), Any( sURL ) );
@@ -523,12 +523,12 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                 {
                     rtl::OUString sHelpFile( mrOptimizerDialog.getPath( TK_HelpFile ) );
                     Reference< XDesktop > desktop( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-                            OUString::createFromAscii( "com.sun.star.frame.Desktop" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
                     Reference< XSimpleFileAccess > xSimpleFileAccess( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-                            OUString::createFromAscii( "com.sun.star.ucb.SimpleFileAccess" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
                     Reference< XInputStream > xInputStream( xSimpleFileAccess->openFileRead( sHelpFile ) );
                     Reference< XDesktop > xDesktop( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithContext(
-                            OUString::createFromAscii( "com.sun.star.frame.Desktop" ), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")), mrOptimizerDialog.GetComponentContext() ), UNO_QUERY_THROW );
                     Reference< XFrame > xDesktopFrame( xDesktop, UNO_QUERY_THROW );
                     xHelpFrame = Reference< XFrame >( xDesktopFrame->findFrame( TKGet( TK__blank ), 0 ) );
                     Reference< XCloseBroadcaster > xCloseBroadcaster( xHelpFrame, UNO_QUERY_THROW );
@@ -541,16 +541,16 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                     aLoadProps[ 1 ].Name = TKGet( TK_InputStream );
                     aLoadProps[ 1 ].Value <<= xInputStream;
 
-                    Reference< XComponent >( xLoader->loadComponentFromURL( OUString::createFromAscii( "private:stream" ),
+                    Reference< XComponent >( xLoader->loadComponentFromURL( OUString(RTL_CONSTASCII_USTRINGPARAM("private:stream")),
                         TKGet( TK__self ), 0, aLoadProps ) );
 
                     Reference< XPropertySet > xPropSet( xHelpFrame, UNO_QUERY_THROW );
                     Reference< XLayoutManager > xLayoutManager;
-                    if ( xPropSet->getPropertyValue( OUString::createFromAscii( "LayoutManager" ) ) >>= xLayoutManager )
+                    if ( xPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager")) ) >>= xLayoutManager )
                     {
                         xLayoutManager->setVisible( sal_False );
-                        xLayoutManager->hideElement( OUString::createFromAscii( "private:resource/menubar/menubar" ) );
-                        xLayoutManager->destroyElement( OUString::createFromAscii( "private:resource/statusbar/statusbar" ) );
+                        xLayoutManager->hideElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/menubar/menubar")) );
+                        xLayoutManager->destroyElement( OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/statusbar/statusbar")) );
                     }
                 }
             }
@@ -603,7 +603,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                                 aLocation = aLocation.copy( 0, nIndex );
 
                             // adding .mini
-                            aLocation = aLocation.concat( OUString::createFromAscii( ".mini" ) );
+                            aLocation = aLocation.concat( OUString(RTL_CONSTASCII_USTRINGPARAM(".mini")) );
                             aFileOpenDialog.setDefaultName( aLocation );
                         }
                     }
@@ -653,7 +653,7 @@ void ActionListener::actionPerformed( const ActionEvent& rEvent )
                 aArgs[ 0 ] <<= mrOptimizerDialog.GetFrame();
 
                 Reference < XDispatch > xDispatch( mrOptimizerDialog.GetComponentContext()->getServiceManager()->createInstanceWithArgumentsAndContext(
-                    OUString::createFromAscii( "com.sun.star.comp.PPPOptimizer" ), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY );
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.PPPOptimizer")), aArgs, mrOptimizerDialog.GetComponentContext() ), UNO_QUERY );
 
                 URL aURL;
                 aURL.Protocol = OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.com.sun.star.comp.PPPOptimizer:" ) );
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index de5cabf20158..ff7e5a00f2d2 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -609,7 +609,7 @@ static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator =
         aVal.setLength( nX + 2 );
         aVal.setCharAt( nX, nSeparator );
     }
-    aVal.append( OUString::createFromAscii( " MB" ) );
+    aVal.append( OUString(RTL_CONSTASCII_USTRINGPARAM(" MB")) );
     return aVal.makeStringAndClear();
 }
 
diff --git a/sdext/source/minimizer/pppoptimizerdialog.cxx b/sdext/source/minimizer/pppoptimizerdialog.cxx
index 5729eda5c4dc..bf7fc438c8f9 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.cxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.cxx
@@ -155,11 +155,11 @@ void SAL_CALL PPPOptimizerDialog::dispatch( const URL& rURL,
 
                 if ( nFileSizeSource && nFileSizeDest )
                 {
-                    rtl::OUStringBuffer sBuf( rtl::OUString::createFromAscii( "Your Presentation has been minimized from:" ) );
+                    rtl::OUStringBuffer sBuf( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Your Presentation has been minimized from:")) );
                     sBuf.append( rtl::OUString::valueOf( nFileSizeSource >> 10 ) );
-                    sBuf.append( rtl::OUString::createFromAscii( "KB to " ) );
+                    sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB to ")) );
                     sBuf.append( rtl::OUString::valueOf( nFileSizeDest >> 10 ) );
-                    sBuf.append( rtl::OUString::createFromAscii( "KB." ) );
+                    sBuf.append( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KB.")) );
                     OUString sResult( sBuf.makeStringAndClear() );
 //                  mpOptimizerDialog->showMessageBox( sResult, sResult, sal_False );
                 }
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx b/sdext/source/minimizer/pppoptimizeruno.cxx
index 1bb4d182bb2b..6ac0f7d22ab3 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -62,14 +62,14 @@ extern "C"
                 sal_Int32                   nPos;
 
                 xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizer_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
                 const Sequence< OUString > & rSNL1 = PPPOptimizer_getSupportedServiceNames();
                 const OUString * pArray1 = rSNL1.getConstArray();
                 for ( nPos = rSNL1.getLength(); nPos--; )
                     xNewKey->createKey( pArray1[nPos] );
 
                 xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PPPOptimizerDialog_getImplementationName() );
-                xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+                xNewKey = xNewKey->createKey( OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")) );
                 const Sequence< OUString > & rSNL2 = PPPOptimizerDialog_getSupportedServiceNames();
                 const OUString * pArray2 = rSNL2.getConstArray();
                 for ( nPos = rSNL2.getLength(); nPos--; )
diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx
index a7c61f1a2577..021872d6dd4a 100644
--- a/sdext/source/pdfimport/services.cxx
+++ b/sdext/source/pdfimport/services.cxx
@@ -138,7 +138,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, voi
     {
         ::rtl::OUString sMainKeyName( sRootKey );
         sMainKeyName += ::rtl::OUString::createFromAscii( pComponents->pAsciiImplementationName );
-        sMainKeyName += ::rtl::OUString::createFromAscii( "/UNO/SERVICES" );
+        sMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
 
         try
         {
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 63cdaa88466a..7426974b3cca 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -109,7 +109,7 @@ namespace
                                     rtl::math::approxEqual(m_aHyperlinkBounds.X2,166.7) &&
                                     rtl::math::approxEqual(m_aHyperlinkBounds.Y2,406.2) );
             CPPUNIT_ASSERT_MESSAGE( "Correct hyperlink URI",
-                                    m_aURI == ::rtl::OUString::createFromAscii( "http://download.openoffice.org/" ) );
+                                    m_aURI == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("http://download.openoffice.org/")) );
 
             const char* sText = " \n \nThis is a testtext\nNew paragraph,\nnew line\n"
                 "Hyperlink, this is\n?\nThis is more text\noutline mode\n?\nNew paragraph\n";
@@ -369,7 +369,7 @@ namespace
 
         virtual void endText()
         {
-            m_aTextOut.append( ::rtl::OUString::createFromAscii("\n") );
+            m_aTextOut.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n")) );
         }
 
         virtual void drawMask(const uno::Sequence<beans::PropertyValue>& xBitmap,
@@ -495,7 +495,7 @@ namespace
                     CPPUNIT_ASSERT_MESSAGE(
                         "Converting ini file to URL",
                         osl_getFileURLFromSystemPath(
-                            (msBaseDir+rtl::OUString::createFromAscii("pdfi_unittest_test.ini")).pData,
+                            (msBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.ini"))).pData,
                             &aIniUrl.pData ) == osl_File_E_None );
 
                     mxCtx = ::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
@@ -516,7 +516,7 @@ namespace
         void testXPDFParser()
         {
             pdfi::ContentSinkSharedPtr pSink( new TestSink() );
-            pdfi::xpdf_ImportFromFile( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"),
+            pdfi::xpdf_ImportFromFile( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")),
                                        pSink,
                                        uno::Reference< task::XInteractionHandler >(),
                                        rtl::OUString(),
@@ -533,12 +533,12 @@ namespace
             aAdaptor.setTreeVisitorFactory( createDrawTreeVisitorFactory() );
 
             ::rtl::OUString aURL, aAbsURL, aBaseURL;
-            osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_draw.xml")).pData,
+            osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_draw.xml"))).pData,
                                           &aURL.pData );
             osl_getProcessWorkingDir(&aBaseURL.pData);
             osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData);
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                                   aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"),
+                                   aAdaptor.odfConvert( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")),
                                                         new OutputWrap(aAbsURL),
                                                         NULL ));
         }
@@ -549,12 +549,12 @@ namespace
             aAdaptor.setTreeVisitorFactory( createWriterTreeVisitorFactory() );
 
             ::rtl::OUString aURL, aAbsURL, aBaseURL;
-            osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_writer.xml")).pData,
+            osl_getFileURLFromSystemPath( (msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_writer.xml"))).pData,
                                           &aURL.pData );
             osl_getProcessWorkingDir(&aBaseURL.pData);
             osl_getAbsoluteFileURL(aBaseURL.pData,aURL.pData,&aAbsURL.pData);
             CPPUNIT_ASSERT_MESSAGE("Exporting to ODF",
-                                   aAdaptor.odfConvert( msBaseDir + rtl::OUString::createFromAscii("pdfi_unittest_test.pdf"),
+                                   aAdaptor.odfConvert( msBaseDir + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")),
                                                         new OutputWrap(aAbsURL),
                                                         NULL ));
         }
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index d23232d5ca79..f0780f87986e 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -61,7 +61,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
     {
         Reference< XComponentContext > xContext( this->m_rProcessor.m_xContext, uno::UNO_SET_THROW );
         Reference< XMultiComponentFactory > xMSF(  xContext->getServiceManager(), uno::UNO_SET_THROW );
-    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"), xContext);
+    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext);
 
         mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
     }
@@ -74,7 +74,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >
     {
         Reference< XComponentContext > xContext( m_rEmitContext.m_xContext, uno::UNO_SET_THROW );
         Reference< XMultiComponentFactory > xMSF(  xContext->getServiceManager(), uno::UNO_SET_THROW );
-    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator"), xContext);
+    Reference < XInterface > xInterface = xMSF->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")), xContext);
         mxBreakIter = uno::Reference< i18n::XBreakIterator >( xInterface, uno::UNO_QUERY );
     }
     return mxBreakIter;
diff --git a/sdext/source/pdfimport/tree/imagecontainer.cxx b/sdext/source/pdfimport/tree/imagecontainer.cxx
index 308e89ae3314..7acc47e7e6c3 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.cxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.cxx
@@ -140,7 +140,7 @@ void ImageContainer::writeBase64EncodedStream( ImageId nId, EmitContext& rContex
         std::find_if(pAry,pAry+nLen,
                      boost::bind(comphelper::TPropertyValueEqualFunctor(),
                                  _1,
-                                 rtl::OUString::createFromAscii("InputSequence"))));
+                                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence")))));
     OSL_ENSURE( pValue != pAry+nLen,
                 "InputSequence not found" );
 
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index dcc9dd01daf3..3d761a10d284 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -669,15 +669,15 @@ uno::Sequence<beans::PropertyValue> Parser::readImageImpl()
         aStreamCreationArgs, m_xContext ), uno::UNO_QUERY_THROW );
 
     uno::Sequence<beans::PropertyValue> aSequence(3);
-    aSequence[0] = beans::PropertyValue( ::rtl::OUString::createFromAscii("URL"),
+    aSequence[0] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),
                                          0,
                                          uno::makeAny(aFileName),
                                          beans::PropertyState_DIRECT_VALUE );
-    aSequence[1] = beans::PropertyValue( ::rtl::OUString::createFromAscii("InputStream"),
+    aSequence[1] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")),
                                          0,
                                          uno::makeAny( xDataStream ),
                                          beans::PropertyState_DIRECT_VALUE );
-    aSequence[2] = beans::PropertyValue( ::rtl::OUString::createFromAscii("InputSequence"),
+    aSequence[2] = beans::PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputSequence")),
                                          0,
                                          uno::makeAny(aDataSequence),
                                          beans::PropertyState_DIRECT_VALUE );
@@ -961,19 +961,19 @@ bool xpdf_ImportFromFile( const ::rtl::OUString&                             rUR
     if( checkEncryption( aSysUPath, xIHdl, aPwd, bIsEncrypted, aDocName ) == false )
         return false;
 
-    rtl::OUStringBuffer converterURL = rtl::OUString::createFromAscii("xpdfimport");
+    rtl::OUStringBuffer converterURL = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("xpdfimport"));
 
     // retrieve package location url (xpdfimport executable is located there)
     // ---------------------------------------------------
     uno::Reference<deployment::XPackageInformationProvider> xProvider(
         xContext->getValueByName(
-            rtl::OUString::createFromAscii("/singletons/com.sun.star.deployment.PackageInformationProvider" )),
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.deployment.PackageInformationProvider"))),
         uno::UNO_QUERY);
     if( xProvider.is() )
     {
         converterURL.insert(
             0,
-            rtl::OUString::createFromAscii("/"));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")));
         converterURL.insert(
             0,
             xProvider->getPackageLocation(
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 02bd3c6b46b1..05042dfd17b2 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -467,7 +467,7 @@ public:
         OUString sName (A2S("Presenter Console"));
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
             PresenterConfigurationAccess::READ_ONLY);
         aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String"))
             >>= sName;
@@ -500,7 +500,7 @@ public:
         {
             PresenterConfigurationAccess aConfiguration (
                 rxContext,
-                OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
                 PresenterConfigurationAccess::READ_ONLY);
             aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String"))
                 >>= sName;
@@ -2254,7 +2254,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
             PresenterConfigurationAccess::READ_ONLY);
         aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String"))
             >>= sName;
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 055689e7d550..e13bbcdc1386 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -134,7 +134,7 @@ PresenterButton::PresenterButton (
 
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxComponentContext),
             UNO_QUERY_THROW);
 
diff --git a/sdext/source/presenter/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index 43c7d037d000..1d14b6473e20 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -628,7 +628,7 @@ void PresenterClock::SetMode (const sal_Int32 nMode)
             mpClockPainter.reset(
                 new AnalogBitmapPainter(
                     mxComponentContext,
-                    OUString::createFromAscii("ClockTheme")));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme"))));
             mpClockPainter2.reset();
             break;
 
@@ -646,7 +646,7 @@ void PresenterClock::SetMode (const sal_Int32 nMode)
             mpClockPainter.reset(
                 new AnalogBitmapPainter(
                     mxComponentContext,
-                    OUString::createFromAscii("ClockTheme")));
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("ClockTheme"))));
             mpClockPainter2.reset(new AnalogDefaultPainter());
             break;
     }
@@ -1034,7 +1034,7 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& r
         // Get access to the clock bitmaps in the configuration.
         PresenterConfigurationAccess aConfiguration (
             mxComponentContext,
-            OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")),
             PresenterConfigurationAccess::READ_ONLY);
 
         Reference<container::XNameAccess> xTheme (GetTheme(aConfiguration));
@@ -1058,20 +1058,20 @@ Reference<container::XNameAccess> AnalogBitmapPainter::GetTheme (
     // Get root of clock themes.
     Reference<container::XHierarchicalNameAccess> xClock (
         rConfiguration.GetConfigurationNode(
-            OUString::createFromAscii("PresenterScreenSettings/AnalogBitmapClock")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/AnalogBitmapClock"))),
         UNO_QUERY);
 
     // Determine the name of the theme to use.
-    OUString sCurrentThemeName (OUString::createFromAscii("DefaultTheme"));
+    OUString sCurrentThemeName (RTL_CONSTASCII_USTRINGPARAM("DefaultTheme"));
     rConfiguration.GetConfigurationNode(
         xClock,
-        OUString::createFromAscii("CurrentTheme")) >>= sCurrentThemeName;
+        OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentTheme"))) >>= sCurrentThemeName;
 
     // Load the clock theme.
     Reference<container::XNameAccess> xThemes (
         rConfiguration.GetConfigurationNode(
             xClock,
-            OUString::createFromAscii("Themes")),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Themes"))),
         UNO_QUERY);
     if (xThemes.is())
     {
@@ -1098,7 +1098,7 @@ bool AnalogBitmapPainter::ThemeNameComparator (
     if (rxCandidate.is())
     {
         OUString sThemeName;
-        if (rxCandidate->getByName(OUString::createFromAscii("ThemeName")) >>= sThemeName)
+        if (rxCandidate->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("ThemeName"))) >>= sThemeName)
         {
             return sThemeName == rsCurrentThemeName;
         }
@@ -1119,13 +1119,13 @@ void AnalogBitmapPainter::LoadBitmaps (
 
     // Get base path to bitmaps.
     Reference<deployment::XPackageInformationProvider> xInformationProvider (
-        mxComponentContext->getValueByName(OUString::createFromAscii(
-            "/singletons/com.sun.star.deployment.PackageInformationProvider")),
+        mxComponentContext->getValueByName(OUString(RTL_CONSTASCII_USTRINGPARAM(
+            "/singletons/com.sun.star.deployment.PackageInformationProvider"))),
         UNO_QUERY);
     OUString sLocation;
     if (xInformationProvider.is())
         sLocation = xInformationProvider->getPackageLocation(gsExtensionIdentifier);
-    sLocation += OUString::createFromAscii("/");
+    sLocation += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
 
     // Create the bitmap loader.
     Reference<lang::XMultiComponentFactory> xFactory (
@@ -1136,7 +1136,7 @@ void AnalogBitmapPainter::LoadBitmaps (
     aArguments[0] <<= rxCanvas;
     Reference<container::XNameAccess> xBitmapLoader(
         xFactory->createInstanceWithArgumentsAndContext(
-            OUString::createFromAscii("com.sun.star.drawing.PresenterWorkaroundService"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterWorkaroundService")),
             aArguments,
             mxComponentContext),
         UNO_QUERY);
@@ -1146,12 +1146,12 @@ void AnalogBitmapPainter::LoadBitmaps (
 
     // Iterate over all entries in the bitmap list and load the bitmaps.
     Reference<container::XNameAccess> xBitmaps (
-        rxClockTheme->getByName(OUString::createFromAscii("Bitmaps")),
+        rxClockTheme->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("Bitmaps"))),
         UNO_QUERY);
     ::std::vector<rtl::OUString> aBitmapProperties (3);
-    aBitmapProperties[0] = OUString::createFromAscii("FileName");
-    aBitmapProperties[1] = OUString::createFromAscii("XOffset");
-    aBitmapProperties[2] = OUString::createFromAscii("YOffset");
+    aBitmapProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("FileName"));
+    aBitmapProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("XOffset"));
+    aBitmapProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("YOffset"));
     PresenterConfigurationAccess::ForAll(
         xBitmaps,
         aBitmapProperties,
@@ -1175,11 +1175,11 @@ void AnalogBitmapPainter::LoadBitmap (
     if (rValues.size() == 3)
     {
         BitmapDescriptor* pDescriptor = NULL;
-        if (rsKey == OUString::createFromAscii("Face"))
+        if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("Face")))
             pDescriptor = &maFace;
-        else if (rsKey == OUString::createFromAscii("HourHand"))
+        else if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("HourHand")))
             pDescriptor = &maHourHand;
-        else if (rsKey == OUString::createFromAscii("MinuteHand"))
+        else if (rsKey == OUString(RTL_CONSTASCII_USTRINGPARAM("MinuteHand")))
             pDescriptor = &maMinuteHand;
 
         if (pDescriptor == NULL)
@@ -1284,12 +1284,12 @@ void DigitalDefaultPainter::Paint (
     {
         sText = OUString::valueOf(nHour>12 ? nHour-12 : nHour);
     }
-    sText += OUString::createFromAscii(":");
+    sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":"));
     const OUString sMinutes (OUString::valueOf(nMinute));
     switch (sMinutes.getLength())
     {
         case 1 :
-            sText += OUString::createFromAscii("0") + sMinutes;
+            sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sMinutes;
             break;
         case 2:
             sText += sMinutes;
@@ -1300,12 +1300,12 @@ void DigitalDefaultPainter::Paint (
     }
     if (bIsShowSeconds)
     {
-        sText += OUString::createFromAscii(":");
+        sText += OUString(RTL_CONSTASCII_USTRINGPARAM(":"));
         const OUString sSeconds (OUString::valueOf(nSecond));
         switch (sSeconds.getLength())
         {
             case 1 :
-                sText += OUString::createFromAscii("0") + sSeconds;
+                sText += OUString(RTL_CONSTASCII_USTRINGPARAM("0")) + sSeconds;
                 break;
             case 2:
                 sText += sSeconds;
@@ -1381,13 +1381,13 @@ void DigitalDefaultPainter::CreateFont (
         // For the case that not all digits have the same width, create
         // different templates for 12 and 24 hour mode.
         if (mbIs24HourFormat)
-            sTimeTemplate = OUString::createFromAscii("20");
+            sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("20"));
         else
-            sTimeTemplate = OUString::createFromAscii("10");
+            sTimeTemplate = OUString(RTL_CONSTASCII_USTRINGPARAM("10"));
         if (bIsShowSeconds)
-            sTimeTemplate += OUString::createFromAscii(":00:00");
+            sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00:00"));
         else
-            sTimeTemplate += OUString::createFromAscii(":00");
+            sTimeTemplate += OUString(RTL_CONSTASCII_USTRINGPARAM(":00"));
 
         rendering::StringContext aContext (
             sTimeTemplate,
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 2dbe9cde966f..d37f0d966db8 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1311,8 +1311,8 @@ double PresenterController::GetSlideAspectRatio (void) const
                 Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW);
                 sal_Int32 nWidth (28000);
                 sal_Int32 nHeight (21000);
-                if ((xProperties->getPropertyValue(OUString::createFromAscii("Width")) >>= nWidth)
-                    && (xProperties->getPropertyValue(OUString::createFromAscii("Height")) >>= nHeight)
+                if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth)
+                    && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight)
                     && nHeight > 0)
                 {
                     nSlideAspectRatio = double(nWidth) / double(nHeight);
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index efab952846b7..d8e3a6c0ac5c 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -390,7 +390,7 @@ void PresenterHelpView::ReadHelpStrings (void)
     mpTextContainer.reset(new TextContainer());
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xStrings (
         aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")),
diff --git a/sdext/source/presenter/PresenterHelper.cxx b/sdext/source/presenter/PresenterHelper.cxx
index 9e7001de426d..13338aefb212 100644
--- a/sdext/source/presenter/PresenterHelper.cxx
+++ b/sdext/source/presenter/PresenterHelper.cxx
@@ -44,28 +44,28 @@ using ::rtl::OUString;
 namespace sdext { namespace presenter {
 
 const OUString PresenterHelper::msPaneURLPrefix(
-    OUString::createFromAscii("private:resource/pane/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/"));
 const OUString PresenterHelper::msCenterPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("CenterPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("CenterPane")));
 const OUString PresenterHelper::msFullScreenPaneURL(
-    msPaneURLPrefix + OUString::createFromAscii("FullScreenPane"));
+    msPaneURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("FullScreenPane")));
 
 const OUString PresenterHelper::msViewURLPrefix(
-    OUString::createFromAscii("private:resource/view/"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/view/"));
 const OUString PresenterHelper::msPresenterScreenURL(
-    msViewURLPrefix + OUString::createFromAscii("PresenterScreen"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreen")));
 const OUString PresenterHelper::msSlideSorterURL(
-    msViewURLPrefix + OUString::createFromAscii("SlideSorter"));
+    msViewURLPrefix + OUString(RTL_CONSTASCII_USTRINGPARAM("SlideSorter")));
 
 const OUString PresenterHelper::msResourceActivationEvent(
-    OUString::createFromAscii("ResourceActivation"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceActivation"));
 const OUString PresenterHelper::msResourceDeactivationEvent(
-    OUString::createFromAscii("ResourceDeactivation"));
+    RTL_CONSTASCII_USTRINGPARAM("ResourceDeactivation"));
 
 const OUString PresenterHelper::msDefaultPaneStyle (
-    OUString::createFromAscii("DefaultPaneStyle"));
+    RTL_CONSTASCII_USTRINGPARAM("DefaultPaneStyle"));
 const OUString PresenterHelper::msDefaultViewStyle (
-    OUString::createFromAscii("DefaultViewStyle"));
+    RTL_CONSTASCII_USTRINGPARAM("DefaultViewStyle"));
 
 
 Reference<presentation::XSlideShowController> PresenterHelper::GetSlideShowController (
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 65380f40b790..096e5615fcbe 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -57,7 +57,7 @@ PresenterPane::PresenterPane (
         mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
     mxPresenterHelper = Reference<drawing::XPresenterHelper>(
         xFactory->createInstanceWithContext(
-            OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
             mxComponentContext),
         UNO_QUERY_THROW);
 }
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 4003c79e4bb9..39283673c23d 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -221,7 +221,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
     if ( ! mxComponentContext.is())
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterSpritePane: missing component context"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: missing component context")),
             static_cast<XWeak*>(this));
     }
 
@@ -233,7 +233,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if ( ! (rArguments[0] >>= mxPaneId))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid pane id"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid pane id")),
                     static_cast<XWeak*>(this),
                     0);
             }
@@ -241,7 +241,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if ( ! (rArguments[1] >>= mxParentWindow))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid parent window"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent window")),
                     static_cast<XWeak*>(this),
                     1);
             }
@@ -250,7 +250,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if ( ! (rArguments[2] >>= xParentCanvas))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid parent canvas"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid parent canvas")),
                     static_cast<XWeak*>(this),
                     2);
             }
@@ -258,7 +258,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if ( ! (rArguments[3] >>= msTitle))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid title"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid title")),
                     static_cast<XWeak*>(this),
                     3);
             }
@@ -266,7 +266,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if ( ! (rArguments[4] >>= mxBorderPainter))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid border painter"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid border painter")),
                     static_cast<XWeak*>(this),
                     4);
             }
@@ -275,7 +275,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
             if (rArguments.getLength()>5 && ! (rArguments[5] >>= bIsWindowVisibleOnCreation))
             {
                 throw lang::IllegalArgumentException(
-                    OUString::createFromAscii("PresenterPane: invalid window visibility flag"),
+                    OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid window visibility flag")),
                     static_cast<XWeak*>(this),
                     5);
             }
@@ -303,7 +303,7 @@ void SAL_CALL PresenterPaneBase::initialize (const Sequence<Any>& rArguments)
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterSpritePane: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSpritePane: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index 8b8be6fb072c..6150d0ce8914 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -60,7 +60,7 @@ namespace sdext { namespace presenter {
 
 OUString PresenterPaneBorderManager::getImplementationName_static (void)
 {
-    return OUString::createFromAscii("com.sun.star.comp.Draw.PresenterPaneBorderManager");
+    return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterPaneBorderManager"));
 }
 
 
@@ -69,7 +69,7 @@ OUString PresenterPaneBorderManager::getImplementationName_static (void)
 Sequence<OUString> PresenterPaneBorderManager::getSupportedServiceNames_static (void)
 {
     static const ::rtl::OUString sServiceName(
-        ::rtl::OUString::createFromAscii("com.sun.star.drawing.PresenterPaneBorderManager"));
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPaneBorderManager"));
     return Sequence<rtl::OUString>(&sServiceName, 1);
 }
 
@@ -108,13 +108,13 @@ PresenterPaneBorderManager::PresenterPaneBorderManager (
     {
         mxPointer = Reference<awt::XPointer>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.awt.Pointer"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer")),
                 rxContext),
             UNO_QUERY_THROW);
 
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxContext),
             UNO_QUERY_THROW);
     }
@@ -282,7 +282,7 @@ void SAL_CALL PresenterPaneBorderManager::initialize (const Sequence<Any>& rArgu
     else
     {
         throw RuntimeException(
-            OUString::createFromAscii("PresenterPane: invalid number of arguments"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterPane: invalid number of arguments")),
                 static_cast<XWeak*>(this));
     }
 }
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 0765ffef4c97..7a27dda1806b 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -477,7 +477,7 @@ PresenterPaneBorderPainter::Renderer::Renderer (
     {
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxContext),
             UNO_QUERY_THROW);
     }
@@ -694,7 +694,7 @@ void PresenterPaneBorderPainter::Renderer::PaintTitle (
     RendererPaneStyleContainer::const_iterator iStyle (maRendererPaneStyles.find(rsResourceURL));
     if (iStyle == maRendererPaneStyles.end())
     {
-        OUString sPaneStyleName (OUString::createFromAscii("DefaultRendererPaneStyle"));
+        OUString sPaneStyleName (RTL_CONSTASCII_USTRINGPARAM("DefaultRendererPaneStyle"));
 
         // Get pane layout name for resource URL.
         const OUString sStyleName (mpTheme->GetStyleName(rsResourceURL));
@@ -955,7 +955,7 @@ RendererPaneStyle::RendererPaneStyle (
         // Get font description.
         mpFont = rpTheme->GetFont(rsStyleName);
 
-        OUString sAnchor (OUString::createFromAscii("Left"));
+        OUString sAnchor (RTL_CONSTASCII_USTRINGPARAM("Left"));
         if (mpFont.get() != NULL)
         {
             sAnchor = mpFont->msAnchor;
@@ -963,11 +963,11 @@ RendererPaneStyle::RendererPaneStyle (
             mnFontYOffset = mpFont->mnYOffset;
         }
 
-        if (sAnchor == OUString::createFromAscii("Left"))
+        if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Left")))
             meFontAnchor = AnchorLeft;
-        else if (sAnchor == OUString::createFromAscii("Right"))
+        else if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Right")))
             meFontAnchor = AnchorRight;
-        else if (sAnchor == OUString::createFromAscii("Center"))
+        else if (sAnchor == OUString(RTL_CONSTASCII_USTRINGPARAM("Center")))
             meFontAnchor = AnchorCenter;
         else
             meFontAnchor = AnchorCenter;
diff --git a/sdext/source/presenter/PresenterPaneContainer.cxx b/sdext/source/presenter/PresenterPaneContainer.cxx
index e9b5cbb95622..feb7ecb6bd02 100644
--- a/sdext/source/presenter/PresenterPaneContainer.cxx
+++ b/sdext/source/presenter/PresenterPaneContainer.cxx
@@ -55,7 +55,7 @@ PresenterPaneContainer::PresenterPaneContainer (
     {
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxContext),
             UNO_QUERY_THROW);
     }
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 4763893698df..5d8b307398ef 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -53,20 +53,20 @@ using ::rtl::OUString;
 namespace sdext { namespace presenter {
 
 const ::rtl::OUString PresenterPaneFactory::msCurrentSlidePreviewPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane1"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane1"));
 const ::rtl::OUString PresenterPaneFactory::msNextSlidePreviewPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane2"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane2"));
 const ::rtl::OUString PresenterPaneFactory::msNotesPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane3"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane3"));
 const ::rtl::OUString PresenterPaneFactory::msToolBarPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane4"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane4"));
 const ::rtl::OUString PresenterPaneFactory::msSlideSorterPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane5"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane5"));
 const ::rtl::OUString PresenterPaneFactory::msHelpPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Pane6"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Pane6"));
 
 const ::rtl::OUString PresenterPaneFactory::msOverlayPaneURL(
-    OUString::createFromAscii("private:resource/pane/Presenter/Overlay"));
+    RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/Overlay"));
 
 
 
@@ -117,7 +117,7 @@ void PresenterPaneFactory::Register (const Reference<frame::XController>& rxCont
         else
         {
             xCC->addResourceFactory(
-                OUString::createFromAscii("private:resource/pane/Presenter/*"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/pane/Presenter/*")),
                 this);
         }
     }
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 951c4610b8be..41d7c40274ba 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -539,11 +539,11 @@ sal_Int32 PresenterScreen::GetScreenNumber (
             // is set.
             PresenterConfigurationAccess aConfiguration (
                 xContext,
-                OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
                 PresenterConfigurationAccess::READ_ONLY);
             bool bStartAlways (false);
             if (aConfiguration.GetConfigurationNode(
-                OUString::createFromAscii("Presenter/StartAlways")) >>= bStartAlways)
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/StartAlways"))) >>= bStartAlways)
             {
                 if (bStartAlways)
                     return nScreenNumber;
@@ -702,13 +702,13 @@ void PresenterScreen::SetupConfiguration (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.Office.extension.PresenterScreen")),
             PresenterConfigurationAccess::READ_ONLY);
         maViewDescriptors.clear();
         ProcessViewDescriptions(aConfiguration);
-        OUString sLayoutName (OUString::createFromAscii("DefaultLayout"));
+        OUString sLayoutName (RTL_CONSTASCII_USTRINGPARAM("DefaultLayout"));
         aConfiguration.GetConfigurationNode(
-            OUString::createFromAscii("Presenter/CurrentLayout")) >>= sLayoutName;
+            OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/CurrentLayout"))) >>= sLayoutName;
         ProcessLayout(aConfiguration, sLayoutName, rxContext, rxAnchorId);
     }
     catch (RuntimeException&)
@@ -729,14 +729,14 @@ void PresenterScreen::ProcessLayout (
     {
         Reference<container::XHierarchicalNameAccess> xLayoutNode (
             rConfiguration.GetConfigurationNode(
-                OUString::createFromAscii("Presenter/Layouts/")+rsLayoutName),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Presenter/Layouts/"))+rsLayoutName),
             UNO_QUERY_THROW);
 
         // Read the parent layout first, if one is referenced.
         OUString sParentLayout;
         rConfiguration.GetConfigurationNode(
             xLayoutNode,
-            OUString::createFromAscii("ParentLayout")) >>= sParentLayout;
+            OUString(RTL_CONSTASCII_USTRINGPARAM("ParentLayout"))) >>= sParentLayout;
         if (sParentLayout.getLength() > 0)
         {
             // Prevent infinite recursion.
@@ -748,16 +748,16 @@ void PresenterScreen::ProcessLayout (
         Reference<container::XNameAccess> xList (
             rConfiguration.GetConfigurationNode(
                 xLayoutNode,
-                OUString::createFromAscii("Layout")),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Layout"))),
             UNO_QUERY_THROW);
 
         ::std::vector<rtl::OUString> aProperties (6);
-        aProperties[0] = OUString::createFromAscii("PaneURL");
-        aProperties[1] = OUString::createFromAscii("ViewURL");
-        aProperties[2] = OUString::createFromAscii("RelativeX");
-        aProperties[3] = OUString::createFromAscii("RelativeY");
-        aProperties[4] = OUString::createFromAscii("RelativeWidth");
-        aProperties[5] = OUString::createFromAscii("RelativeHeight");
+        aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("PaneURL"));
+        aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL"));
+        aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeX"));
+        aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeY"));
+        aProperties[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeWidth"));
+        aProperties[5] = OUString(RTL_CONSTASCII_USTRINGPARAM("RelativeHeight"));
         mnComponentIndex = 1;
         PresenterConfigurationAccess::ForAll(
             xList,
@@ -786,10 +786,10 @@ void PresenterScreen::ProcessViewDescriptions (
             UNO_QUERY_THROW);
 
         ::std::vector<rtl::OUString> aProperties (4);
-        aProperties[0] = OUString::createFromAscii("ViewURL");
-        aProperties[1] = OUString::createFromAscii("Title");
-        aProperties[2] = OUString::createFromAscii("AccessibleTitle");
-        aProperties[3] = OUString::createFromAscii("IsOpaque");
+        aProperties[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("ViewURL"));
+        aProperties[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
+        aProperties[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("AccessibleTitle"));
+        aProperties[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsOpaque"));
         mnComponentIndex = 1;
         PresenterConfigurationAccess::ForAll(
             xViewDescriptionsNode,
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 5786ccba2a2f..7b78acaed7aa 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -129,7 +129,7 @@ PresenterScrollBar::PresenterScrollBar (
 
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxComponentContext),
             UNO_QUERY_THROW);
 
@@ -331,7 +331,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
                     try
                     {
                         mpBitmaps.reset(new PresenterBitmapContainer(
-                            OUString::createFromAscii("PresenterScreenSettings/ScrollBar/Bitmaps"),
+                            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterScreenSettings/ScrollBar/Bitmaps")),
                             ::boost::shared_ptr<PresenterBitmapContainer>(),
                             mxComponentContext,
                             mxCanvas,
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 3954a5ff1ed8..ce5c23a82829 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -79,8 +79,8 @@ PresenterSlidePreview::PresenterSlidePreview (
         || ! rpPresenterController.is())
     {
         throw RuntimeException(
-            OUString::createFromAscii(
-                "PresenterSlidePreview can not be constructed due to empty argument"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM(
+                "PresenterSlidePreview can not be constructed due to empty argument")),
             static_cast<XWeak*>(this));
     }
 
@@ -106,7 +106,7 @@ PresenterSlidePreview::PresenterSlidePreview (
     if (xFactory.is())
         mxPreviewRenderer = Reference<drawing::XSlideRenderer>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.drawing.SlideRenderer"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SlideRenderer")),
                 rxContext),
             UNO_QUERY);
 
@@ -278,9 +278,9 @@ void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPag
         try
         {
             xPropertySet->getPropertyValue(
-                OUString::createFromAscii("Width")) >>= aSlideSize.Width;
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= aSlideSize.Width;
             xPropertySet->getPropertyValue(
-                OUString::createFromAscii("Height")) >>= aSlideSize.Height;
+                OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= aSlideSize.Height;
         }
         catch (beans::UnknownPropertyException&)
         {
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index e63f22b5a84a..312b07f5fda8 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -116,7 +116,7 @@ void PresenterSlideShowView::LateInit (void)
     Reference<lang::XMultiComponentFactory> xFactory (
         mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
     mxPresenterHelper.set (xFactory->createInstanceWithContext(
-                   OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                   OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                    mxComponentContext),
                UNO_QUERY_THROW);
 
@@ -545,7 +545,7 @@ void SAL_CALL PresenterSlideShowView::setMouseCursor(::sal_Int16 nPointerShape)
             mxComponentContext, UNO_QUERY);
         if (xFactory.is())
             mxPointer = Reference<awt::XPointer>(
-                xFactory->createInstance(OUString::createFromAscii("com.sun.star.awt.Pointer")),
+                xFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Pointer"))),
                 UNO_QUERY);
     }
 
@@ -973,7 +973,7 @@ Reference<awt::XWindow> PresenterSlideShowView::CreateViewWindow (
 
         Reference<awt::XToolkit> xToolkit (
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.awt.Toolkit"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.Toolkit")),
                 mxComponentContext),
             UNO_QUERY_THROW);
         awt::WindowDescriptor aWindowDescriptor (
@@ -1148,7 +1148,7 @@ void PresenterSlideShowView::ThrowIfDisposed (void)
     if (rBHelper.bDisposed || rBHelper.bInDispose)
     {
         throw lang::DisposedException (
-            OUString::createFromAscii("PresenterSlideShowView object has already been disposed"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("PresenterSlideShowView object has already been disposed")),
             static_cast<uno::XWeak*>(this));
     }
 }
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 0f65c9331a1c..3fe9051949c1 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -375,7 +375,7 @@ PresenterSlideSorter::PresenterSlideSorter (
         // Create the preview cache.
         mxPreviewCache = Reference<drawing::XSlidePreviewCache>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.drawing.PresenterPreviewCache"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PresenterPreviewCache")),
                 mxComponentContext),
             UNO_QUERY_THROW);
         Reference<container::XIndexAccess> xSlides (mxSlideShowController, UNO_QUERY);
@@ -396,7 +396,7 @@ PresenterSlideSorter::PresenterSlideSorter (
         // Listen for changes of the current slide.
         Reference<beans::XPropertySet> xControllerProperties (rxController, UNO_QUERY_THROW);
         xControllerProperties->addPropertyChangeListener(
-            OUString::createFromAscii("CurrentPage"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("CurrentPage")),
             this);
 
         // Move the current slide in the center of the window.
@@ -983,8 +983,8 @@ double PresenterSlideSorter::GetSlideAspectRatio (void) const
             Reference<beans::XPropertySet> xProperties(xSlides->getByIndex(0),UNO_QUERY_THROW);
             sal_Int32 nWidth (28000);
             sal_Int32 nHeight (21000);
-            if ((xProperties->getPropertyValue(OUString::createFromAscii("Width")) >>= nWidth)
-                && (xProperties->getPropertyValue(OUString::createFromAscii("Height")) >>= nHeight)
+            if ((xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Width"))) >>= nWidth)
+                && (xProperties->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Height"))) >>= nHeight)
                 && nHeight > 0)
             {
                 nSlideAspectRatio = double(nWidth) / double(nHeight);
@@ -2066,7 +2066,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
 {
     PresenterConfigurationAccess aConfiguration (
         rxContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XHierarchicalNameAccess> xBitmaps (
         aConfiguration.GetConfigurationNode(
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index 1f8ebdbbc35e..ae4866f58879 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -55,7 +55,7 @@ PresenterSpritePane::PresenterSpritePane (const Reference<XComponentContext>& rx
         mxComponentContext->getServiceManager(), UNO_QUERY_THROW);
     mxPresenterHelper = Reference<drawing::XPresenterHelper>(
         xFactory->createInstanceWithContext(
-            OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
             mxComponentContext),
         UNO_QUERY_THROW);
 }
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index 0777d147cff9..6688f7e8b679 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -341,7 +341,7 @@ void SAL_CALL PresenterTheme::disposing (void)
 
     PresenterConfigurationAccess aConfiguration (
         mxContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
         PresenterConfigurationAccess::READ_ONLY);
 
     return aReadContext.ReadTheme(aConfiguration, msThemeName);
@@ -451,7 +451,7 @@ bool PresenterTheme::ConvertToColor (
     ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
         new PresenterConfigurationAccess(
             mxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
             PresenterConfigurationAccess::READ_WRITE));
 
     // Get configuration node for the view style container of the current
@@ -603,7 +603,7 @@ PresenterTheme::FontDescriptor::FontDescriptor (void)
       msStyleName(),
       mnSize(12),
       mnColor(0x00000000),
-      msAnchor(OUString::createFromAscii("Left")),
+      msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))),
       mnXOffset(0),
       mnYOffset(0)
 {
@@ -618,7 +618,7 @@ PresenterTheme::FontDescriptor::FontDescriptor (
       msStyleName(),
       mnSize(12),
       mnColor(0x00000000),
-      msAnchor(OUString::createFromAscii("Left")),
+      msAnchor(OUString(RTL_CONSTASCII_USTRINGPARAM("Left"))),
       mnXOffset(0),
       mnYOffset(0)
 {
@@ -869,7 +869,7 @@ ReadContext::ReadContext (
     {
         mxPresenterHelper = Reference<drawing::XPresenterHelper>(
             xFactory->createInstanceWithContext(
-                OUString::createFromAscii("com.sun.star.comp.Draw.PresenterHelper"),
+                OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.Draw.PresenterHelper")),
                 rxContext),
             UNO_QUERY_THROW);
     }
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index ad5d6161eca8..a2bed04f66f4 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -778,7 +778,7 @@ void PresenterToolBar::CreateControls (
     // Expand the macro in the bitmap file names.
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
         PresenterConfigurationAccess::READ_ONLY);
 
     const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext));
@@ -2092,7 +2092,7 @@ void ProgressLabel::CurrentSlideHasChanged (void)
         if (nCurrentSlideIndex >= 0 && nSlideCount > 0)
             SetText(
                 OUString::valueOf(nCurrentSlideIndex)
-                    + OUString::createFromAscii(" / ")
+                    + OUString(RTL_CONSTASCII_USTRINGPARAM(" / "))
                         + OUString::valueOf(nSlideCount));
         else
             SetText(A2S(""));
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 821e927dcb5b..9ee8cff274ae 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -754,7 +754,7 @@ void PresenterWindowManager::RestoreViewMode (void)
     sal_Int32 nMode (0);
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
         PresenterConfigurationAccess::READ_ONLY);
     aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode;
     switch (nMode)
@@ -783,7 +783,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
     {
         PresenterConfigurationAccess aConfiguration (
             mxComponentContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.extension.PresenterScreen/")),
             PresenterConfigurationAccess::READ_WRITE);
         aConfiguration.GoToChild(A2S("Presenter"));
         Any aValue;