probably the last uses of the one argument String::CreateFromAscii variant

Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c

28 files changed, 88 insertions, 113 deletions

diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index 1015afbb7bb0..4f3e0dc45e01 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -157,8 +157,7 @@ HTMLReader::HTMLReader()
 
 String HTMLReader::GetTemplateName() const
 {
-    String sTemplate(
-            String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("internal")) );
+    String sTemplate(rtl::OUString("internal"));
     sTemplate += INET_PATH_TOKEN;
     sTemplate.AppendAscii( TOOLS_CONSTASCII_STRINGPARAM("html") );
     String sTemplateWithoutExt( sTemplate );
@@ -2035,8 +2034,7 @@ void SwHTMLParser::NextToken( int nToken )
 
     if( bInsertUnknown )
     {
-        String aComment(
-            String::CreateFromAscii(TOOLS_CONSTASCII_STRINGPARAM("HTML: <")) );
+        String aComment(rtl::OUString("HTML: <"));
         if( (HTML_TOKEN_ONOFF & nToken) != 0 && (1 & nToken) != 0 )
             aComment += '/';
         aComment += sSaveToken;
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 8ef6eefdf0bc..a6b3498883e6 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -363,8 +363,7 @@ void SwRTFParser::ReadListTable()
                 if( pCurRule && pCurRule->IsContinusNum() )
                     lcl_ExpandNumFmts( *pCurRule );
 
-                String sTmp( String::CreateFromAscii(
-                    RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+                String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
                 aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, 0, sal_False, SvxNumberFormat::LABEL_ALIGNMENT );
                 pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
                 // #i91400#
@@ -564,8 +563,7 @@ void SwRTFParser::ReadListOverrideTable()
                                                 aListArr[ n ].nListDocPos ];
                             pOrigRule = pRule;
 
-                            String sTmp( String::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+                            String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
                             aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, pRule );
                             pRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
                             // #i91400#
@@ -814,8 +812,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
     {
         // dann muessen wir die mal anlegen
         nNewNumSectDef &= ~nNewFlag;
-        String sTmp( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( RTF_NUMRULE_NAME " 1" )));
+        String sTmp(rtl::OUString(RTF_NUMRULE_NAME " 1"));
         SwListEntry aEntry( nListNo, 0, pDoc->MakeNumRule( sTmp ));
         aEntry.nListNo = nListNo;
         aListArr.push_back( aEntry );
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 63f953fe9e12..787e2fbfe945 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -937,7 +937,7 @@ long Ww1Bookmarks::Len() const
 const String Ww1Bookmarks::GetName() const
 {
     if( nIsEnd )
-        return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "???" ));
+        return rtl::OUString("???");
     return aNames.GetStr( nPlcIdx[0] );
 }
 
diff --git a/sw/source/filter/ww8/writerwordglue.cxx b/sw/source/filter/ww8/writerwordglue.cxx
index 8816e7b61bc8..a515b2c44503 100644
--- a/sw/source/filter/ww8/writerwordglue.cxx
+++ b/sw/source/filter/ww8/writerwordglue.cxx
@@ -745,10 +745,10 @@ namespace sw
             bool bForceJapanese = ( STRING_NOTFOUND != rParams.SearchChar( sJChars.getStr() ) );
             if ( bForceJapanese )
             {
-                rParams.SearchAndReplaceAll( String::CreateFromAscii( "ee" ),
-                                             String::CreateFromAscii( "yyyy" ) );
-                rParams.SearchAndReplaceAll( String::CreateFromAscii( "EE" ),
-                                             String::CreateFromAscii( "YYYY" ) );
+                rParams.SearchAndReplaceAll( rtl::OUString( "ee" ),
+                                             rtl::OUString( "yyyy" ) );
+                rParams.SearchAndReplaceAll( rtl::OUString( "EE" ),
+                                             rtl::OUString( "YYYY" ) );
             }
             if (LANGUAGE_FRENCH != nDocLang)
             {
@@ -764,10 +764,10 @@ namespace sw
 
             // Force to NatNum when finding one of 'oOA'
             String sOldParams( rParams );
-            rParams.SearchAndReplaceAll( String::CreateFromAscii( "o" ),
-                                         String::CreateFromAscii( "m" ) );
-            rParams.SearchAndReplaceAll( String::CreateFromAscii( "O" ),
-                                         String::CreateFromAscii( "M" ) );
+            rParams.SearchAndReplaceAll( rtl::OUString( "o" ),
+                                         rtl::OUString( "m" ) );
+            rParams.SearchAndReplaceAll( rtl::OUString( "O" ),
+                                         rtl::OUString( "M" ) );
             bool bForceNatNum = !sOldParams.Equals( rParams );
             if (LANGUAGE_FRENCH != nDocLang)
             {
@@ -814,7 +814,7 @@ namespace sw
                     if (nChar == '/')
                     {
                         // MM We have to escape '/' in case it's used as a char
-                        rParams.Replace(nI, 1, CREATE_CONST_ASC("\\/"));
+                        rParams.Replace(nI, 1, rtl::OUString("\\/"));
                         nI++;
                         nLen++;
                     }
@@ -944,10 +944,10 @@ namespace sw
                 rLang = LANGUAGE_JAPANESE;
 
             if (bForceNatNum)
-                rParams.Insert(CREATE_CONST_ASC("[NatNum1][$-411]"),0);
+                rParams.Insert(rtl::OUString("[NatNum1][$-411]"),0);
 
             if (bHijri)
-                rParams.Insert(CREATE_CONST_ASC("[~hijri]"), 0);
+                rParams.Insert(rtl::OUString("[~hijri]"), 0);
 
             pFormatter->PutEntry(rParams, nCheckPos, nType, nKey, rLang);
 
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d2205e2d7da8..df0c10bc9494 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -2827,7 +2827,7 @@ bool SwMSConvertControls::ExportControl(WW8Export &rWW8Wrt, const SdrObject *pOb
 
     //Open the ObjectPool
     SvStorageRef xObjPool = rWW8Wrt.GetWriter().GetStorage().OpenSotStorage(
-        CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+        rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
         STREAM_SHARE_DENYALL);
 
     //Create a destination storage for the microsoft control
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index 2ac82b1e1992..0f733416bdf9 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -54,7 +54,7 @@ using namespace sw::util;
 sal_uInt16 MSWordExportBase::DuplicateNumRule( const SwNumRule *pRule, sal_uInt8 nLevel, sal_uInt16 nVal )
 {
     sal_uInt16 nNumId = USHRT_MAX;
-    String sPrefix( CREATE_CONST_ASC( "WW8TempExport" ) );
+    String sPrefix(rtl::OUString("WW8TempExport"));
     sPrefix += String::CreateFromInt32( nUniqueList++ );
     SwNumRule* pMyNumRule =
             new SwNumRule( pDoc->GetUniqueNumRuleName( &sPrefix ),
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 26eef0bc734e..2a1d4bbdbdf5 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -534,7 +534,7 @@ void MSWordStyles::OutputStyle( SwFmt* pFmt, sal_uInt16 nPos )
 
         String aName = pFmt->GetName();
         if ( aName.EqualsAscii( "Default" ) )
-            aName = String::CreateFromAscii( "Normal" );
+            aName = rtl::OUString("Normal");
 
         m_rExport.AttrOutput().StartStyle( aName, bFmtColl,
                 nBase, nWwNext, GetWWId( *pFmt ), nPos,
@@ -772,13 +772,13 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc)
 {
     mbWrtWW8 = bWrtWW8;
 
-    GetId(wwFont(CREATE_CONST_ASC("Times New Roman"), PITCH_VARIABLE,
+    GetId(wwFont(rtl::OUString("Times New Roman"), PITCH_VARIABLE,
         FAMILY_ROMAN, RTL_TEXTENCODING_MS_1252,bWrtWW8));
 
-    GetId(wwFont(CREATE_CONST_ASC("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
+    GetId(wwFont(rtl::OUString("Symbol"), PITCH_VARIABLE, FAMILY_ROMAN,
         RTL_TEXTENCODING_SYMBOL,bWrtWW8));
 
-    GetId(wwFont(CREATE_CONST_ASC("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
+    GetId(wwFont(rtl::OUString("Arial"), PITCH_VARIABLE, FAMILY_SWISS,
         RTL_TEXTENCODING_MS_1252,bWrtWW8));
 
     const SvxFontItem* pFont = (const SvxFontItem*)GetDfltAttr(RES_CHRATR_FONT);
@@ -2051,7 +2051,7 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp,
                                 // Additional paragraph containing a space to
                                 // assure that by WW created RTF from written WW8
                                 // does not crash WW.
-                                rWrt.WriteStringAsPara( String::CreateFromAscii( " " ) );
+                                rWrt.WriteStringAsPara( rtl::OUString(" ") );
                             }
                         }
                     }
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 4ba4538938c1..9c662da10bb9 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -223,8 +223,8 @@ public:
 #define ANZ_DEFAULT_STYLES 16
 
 // die Namen der StorageStreams
-#define sMainStream CREATE_CONST_ASC("WordDocument")
-#define sCompObj CREATE_CONST_ASC("\1CompObj")
+#define sMainStream rtl::OUString("WordDocument")
+#define sCompObj rtl::OUString("\1CompObj")
 
 static void WriteDop( WW8Export& rWrt )
 {
@@ -1440,7 +1440,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
     if( !pRedlAuthors )
     {
         pRedlAuthors = new WW8_WrtRedlineAuthor;
-        pRedlAuthors->AddName(CREATE_CONST_ASC("Unknown"));
+        pRedlAuthors->AddName(rtl::OUString("Unknown"));
     }
     return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
 }
@@ -2596,7 +2596,7 @@ void WW8Export::WriteFkpPlcUsw()
              some magic. cmc
             */
             /* Similiarly having msvbasic storage seems to also trigger creating this stream */
-            GetWriter().GetStorage().OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool),
+            GetWriter().GetStorage().OpenSotStorage(rtl::OUString(SL::aObjectPool),
                 STREAM_READWRITE | STREAM_SHARE_DENYALL);
         }
 
@@ -2930,9 +2930,9 @@ void WW8Export::ExportDocument_Impl()
     if( bWrtWW8 )
     {
         pFib->fWhichTblStm = 1;
-        xTableStrm = GetWriter().GetStorage().OpenSotStream(CREATE_CONST_ASC(SL::a1Table),
+        xTableStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::a1Table),
             STREAM_STD_WRITE );
-        xDataStrm = GetWriter().GetStorage().OpenSotStream(CREATE_CONST_ASC(SL::aData),
+        xDataStrm = GetWriter().GetStorage().OpenSotStream(rtl::OUString(SL::aData),
             STREAM_STD_WRITE );
 
         xDataStrm->SetBufferSize( 32768 );  // fuer Grafiken
@@ -3109,7 +3109,7 @@ void WW8Export::ExportDocument_Impl()
         {
             xDataStrm.Clear();
             pDataStrm = 0;
-            GetWriter().GetStorage().Remove(CREATE_CONST_ASC(SL::aData));
+            GetWriter().GetStorage().Remove(rtl::OUString(SL::aData));
         }
     }
 }
@@ -3406,7 +3406,7 @@ void WW8Export::RestoreMacroCmds()
     try
     {
         uno::Reference < io::XStream > xSrcStream =
-                xSrcRoot->openStreamElement( CREATE_CONST_ASC(SL::aMSMacroCmds), embed::ElementModes::READ );
+                xSrcRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READ );
         SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xSrcStream );
 
         if ( pStream && SVSTREAM_OK == pStream->GetError())
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index c0008d7ec734..041f7184330c 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -233,7 +233,7 @@ void WW8Export::OutputOLENode( const SwOLENode& rOLENode )
     pDataAdr = pSpecOLE + 2; //WW6 sprm is 1 but has 1 byte len as well.
 
     SvStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
-        CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+        rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
         STREAM_SHARE_DENYALL );
 
     if( xObjStg.Is()  )
@@ -353,7 +353,7 @@ void WW8Export::OutputLinkedOLE( const rtl::OUString& rOleId )
     SotStorageRef xObjSrc = SotStorage::OpenOLEStorage( xOleStg, rOleId, STREAM_READ );
 
     SotStorageRef xObjStg = GetWriter().GetStorage().OpenSotStorage(
-        CREATE_CONST_ASC(SL::aObjectPool), STREAM_READWRITE |
+        rtl::OUString(SL::aObjectPool), STREAM_READWRITE |
         STREAM_SHARE_DENYALL );
 
     if( xObjStg.Is() && xObjSrc.Is() )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c87d9a7626b4..02475f9bf14c 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -1933,7 +1933,7 @@ void WW8Export::StartCommentOutput(const String& rName)
 
 void WW8Export::EndCommentOutput(const String& rName)
 {
-    String sStr(CREATE_CONST_ASC(" ["));
+    String sStr(rtl::OUString(" ["));
     sStr += rName;
     sStr.APPEND_CONST_ASC("] ");
     OutputField(0, ww::eQUOTE, sStr, WRITEFIELD_CMD_END | WRITEFIELD_END |
@@ -2414,7 +2414,7 @@ void WW8Export::WritePostItBegin( ww::bytes* pOut )
 
 String FieldString(ww::eField eIndex)
 {
-    String sRet(CREATE_CONST_ASC("  "));
+    String sRet(rtl::OUString("  "));
     if (const char *pField = ww::GetEnglishFieldName(eIndex))
         sRet.InsertAscii(pField, 1);
     return sRet;
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index cc5e02192d76..536b1bbcc622 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -206,7 +206,7 @@ bool BasicProjImportHelper::import( const uno::Reference< io::XInputStream >& rx
         oox::StorageRef vbaStg = root.openSubStorage( CREATE_OUSTRING( "Macros" ), false );
         if ( vbaStg.get() )
         {
-            oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), CREATE_CONST_ASC( "Writer") );
+            oox::ole::VbaProject aVbaPrj( mxCtx, mrDocShell.GetModel(), rtl::OUString("Writer") );
             bRet = aVbaPrj.importVbaProject( *vbaStg );
         }
     }
@@ -3611,7 +3611,7 @@ SwWW8ImplReader::SwWW8ImplReader(sal_uInt8 nVersionPara, SvStorage* pStorage,
     maSectionManager(*this),
     m_aExtraneousParas(rD),
     maInsertedTables(rD),
-    maSectionNameGenerator(rD,CREATE_CONST_ASC("WW")),
+    maSectionNameGenerator(rD, rtl::OUString("WW")),
     maGrfNameGenerator(bNewDoc,String('G')),
     maParaStyleMapper(rD),
     maCharStyleMapper(rD),
@@ -4125,7 +4125,7 @@ void SwWW8ImplReader::StoreMacroCmds()
         try
         {
             uno::Reference < io::XStream > xStream =
-                    xRoot->openStreamElement( CREATE_CONST_ASC(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
+                    xRoot->openStreamElement( rtl::OUString(SL::aMSMacroCmds), embed::ElementModes::READWRITE );
             SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( xStream );
 
             sal_uInt8 *pBuffer = new sal_uInt8[pWwFib->lcbCmds];
@@ -4774,7 +4774,7 @@ sal_uLong SwWW8ImplReader::SetSubStreams(SvStorageStreamRef &rTableStream,
             pTableStream = &rTableStream;
             pTableStream->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 
-            rDataStream = pStg->OpenSotStream(CREATE_CONST_ASC(SL::aData),
+            rDataStream = pStg->OpenSotStream(rtl::OUString(SL::aData),
                 STREAM_STD_READ | STREAM_NOCREATE );
 
             if (rDataStream.Is() && SVSTREAM_OK == rDataStream->GetError())
@@ -5653,7 +5653,7 @@ sal_Bool SwMSDffManager::GetOLEStorageName(long nOLEId, String& rStorageName,
     {
         rStorageName = '_';
         rStorageName += rtl::OUString::valueOf(nPictureId);
-        rSrcStorage = rReader.pStg->OpenSotStorage(CREATE_CONST_ASC(
+        rSrcStorage = rReader.pStg->OpenSotStorage(rtl::OUString(
             SL::aObjectPool));
         if (!rReader.mpDocShell)
             bRet=false;
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 345347f25ef6..1b1597493c92 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -774,7 +774,7 @@ SwNumRule* SwWW8ImplReader::GetStyRule()
     if( pStyles->pStyRule )         // Bullet-Style bereits vorhanden
         return pStyles->pStyRule;
 
-    const String aBaseName(CREATE_CONST_ASC( "WW8StyleNum" ));
+    const String aBaseName(rtl::OUString("WW8StyleNum"));
     const String aName( rDoc.GetUniqueNumRuleName( &aBaseName, false) );
 
     // #i86652#
@@ -850,7 +850,7 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
         // If NumRuleItems were set, either directly or through inheritance, disable them now
         pAktColl->SetFmtAttr( SwNumRuleItem() );
 
-        String aName(CREATE_CONST_ASC( "Outline" ));
+        String aName(rtl::OUString("Outline"));
         SwNumRule aNR( rDoc.GetUniqueNumRuleName( &aName ),
                        SvxNumberFormat::LABEL_WIDTH_AND_POSITION,
                        OUTLINE_RULE );
@@ -4298,7 +4298,7 @@ void WW8RStyle::ImportOldFormatStyles()
                 if (const sal_Char *pStr = GetEnglishNameFromSti(eSti))
                     sName = String(pStr, RTL_TEXTENCODING_ASCII_US);
                 else
-                    sName = String(CREATE_CONST_ASC("Unknown"));
+                    sName = rtl::OUString("Unknown");
             }
             else               // user style
             {
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 6ffa47d2b549..77b81ab54538 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1035,7 +1035,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8 nLevel, SwNumRule& rNumRule,
 SwNumRule* WW8ListManager::CreateNextRule(bool bSimple)
 {
     // wird erstmal zur Bildung des Style Namens genommen
-    String sPrefix(CREATE_CONST_ASC("WW8Num"));
+    String sPrefix(rtl::OUString("WW8Num"));
     sPrefix += String::CreateFromInt32(nUniqueList++);
     // #i86652#
     sal_uInt16 nRul =
@@ -1270,7 +1270,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                     break;
                 // Nauemsprefix aufbauen: fuer NumRule-Name (eventuell)
                 // und (falls vorhanden) fuer Style-Name (dann auf jeden Fall)
-                String sPrefix(CREATE_CONST_ASC( "WW8NumSt" ));
+                String sPrefix(rtl::OUString("WW8NumSt"));
                 sPrefix += String::CreateFromInt32( nLfo + 1 );
                 // jetzt dem pNumRule seinen RICHTIGEN Wert zuweisen !!!
                 // (bis dahin war hier die Parent NumRule vermerkt )
@@ -2227,7 +2227,7 @@ void WW8FormulaControl::FormulaRead(SwWw8ControlType nWhich,
 }
 
 WW8FormulaListBox::WW8FormulaListBox(SwWW8ImplReader &rR)
-    : WW8FormulaControl( CREATE_CONST_ASC(SL::aListBox), rR)
+    : WW8FormulaControl(rtl::OUString(SL::aListBox), rR)
 {
 }
 
@@ -2436,7 +2436,7 @@ sal_Bool WW8FormulaListBox::Import(const uno::Reference <
 }
 
 WW8FormulaCheckBox::WW8FormulaCheckBox(SwWW8ImplReader &rR)
-    : WW8FormulaControl( CREATE_CONST_ASC(SL::aCheckBox), rR)
+    : WW8FormulaControl(rtl::OUString(SL::aCheckBox), rR)
 {
 }
 
@@ -2502,7 +2502,7 @@ sal_Bool WW8FormulaCheckBox::Import(const uno::Reference <
 }
 
 WW8FormulaEditBox::WW8FormulaEditBox(SwWW8ImplReader &rR)
-    : WW8FormulaControl( CREATE_CONST_ASC(SL::aTextField) ,rR)
+    : WW8FormulaControl(rtl::OUString(SL::aTextField) ,rR)
 {
 }
 
diff --git a/sw/source/filter/ww8/ww8par4.cxx b/sw/source/filter/ww8/ww8par4.cxx
index 2765d2ce3c34..5e7f1aca5520 100644
--- a/sw/source/filter/ww8/ww8par4.cxx
+++ b/sw/source/filter/ww8/ww8par4.cxx
@@ -87,7 +87,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
     //      0x2c, 0x30 Skalierung x,y in Promille
     //      0x34, 0x38, 0x3c, 0x40 Crop Left, Top, Right, Bot in tw
 
-    SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( CREATE_CONST_ASC( "\3PIC" ),
+    SvStorageStreamRef xSrc3 = rSrc1->OpenSotStream( rtl::OUString("\3PIC"),
         STREAM_STD_READ | STREAM_NOCREATE);
     SvStorageStream* pS = xSrc3;
     pS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -132,7 +132,7 @@ static bool SwWw8ReadScaling(long& rX, long& rY, SvStorageRef& rSrc1)
 static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
     SvStorageRef& rSrc1)
 {
-    SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( CREATE_CONST_ASC("\3META"),
+    SvStorageStreamRef xSrc2 = rSrc1->OpenSotStream( rtl::OUString("\3META"),
         STREAM_STD_READ | STREAM_NOCREATE);
     SvStorageStream* pSt = xSrc2;
     pSt->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
@@ -188,7 +188,7 @@ static bool SwWw6ReadMetaStream(GDIMetaFile& rWMF, OLE_MFP* pMfp,
 static bool SwWw6ReadMacPICTStream(Graphic& rGraph, SvStorageRef& rSrc1)
 {
     // 03-META-Stream nicht da. Vielleicht ein 03-PICT ?
-    SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream( CREATE_CONST_ASC( "\3PICT" ));
+    SvStorageStreamRef xSrc4 = rSrc1->OpenSotStream(rtl::OUString("\3PICT"));
     SvStorageStream* pStp = xSrc4;
     pStp->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     sal_uInt8 aTestA[10];        // Ist der 01Ole-Stream ueberhaupt vorhanden
@@ -355,7 +355,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
     // ergibt Name "_4711"
     aSrcStgName += String::CreateFromInt32( nObjLocFc );
 
-    SvStorageRef xSrc0 = pStg->OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool));
+    SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
     SvStorageRef xSrc1 = xSrc0->OpenSotStorage( aSrcStgName,
             STREAM_READWRITE| STREAM_SHARE_DENYALL );
 
@@ -432,7 +432,7 @@ SdrObject* SwWW8ImplReader::ImportOleBase( Graphic& rGraph,
             sal_Int64 nAspect = embed::Aspects::MSOLE_CONTENT;
 
             {
-                SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream( CREATE_CONST_ASC( "\3ObjInfo" ),
+                SvStorageStreamRef xObjInfoSrc = xSrc1->OpenSotStream(rtl::OUString("\3ObjInfo"),
                     STREAM_STD_READ | STREAM_NOCREATE );
                 if ( xObjInfoSrc.Is() && !xObjInfoSrc->GetError() )
                 {
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index f35563ef6d21..1377713a4382 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -360,7 +360,7 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
         // needed if the filterflags say we will convert bookmarks
         // to SetExpFields! And this the exception!
 
-        String sHex(CREATE_CONST_ASC( "\\x" ));
+        rtl::OUString sHex("\\x");
         bool bSetAsHex;
         bool bAllowCr = SwFltGetFlag(nFieldFlags,
             SwFltControlStack::ALLOW_FLD_CR) ? true : false;
@@ -586,10 +586,10 @@ String GetWordDefaultDateStringAsUS(SvNumberFormatter* pFormatter, sal_uInt16 nL
     // #i36594#
     // Fix provided by mloiseleur@openoffice.org.
     // A default date can have already 4 year digits, in some case
-    const xub_StrLen pos = sParams.Search( CREATE_CONST_ASC("YYYY") );
+    const xub_StrLen pos = sParams.Search(rtl::OUString("YYYY"));
     if ( pos == STRING_NOTFOUND )
     {
-        sParams.SearchAndReplace(CREATE_CONST_ASC("YY"), CREATE_CONST_ASC("YYYY"));
+        sParams.SearchAndReplace(rtl::OUString("YY"), rtl::OUString("YYYY"));
     }
     return sParams;
 }
@@ -633,7 +633,7 @@ short SwWW8ImplReader::GetTimeDatePara(String& rStr, sal_uInt32& rFormat,
         }
 
         if (bHijri)
-            sParams.Insert(CREATE_CONST_ASC("[~hijri]"), 0);
+            sParams.Insert(rtl::OUString("[~hijri]"), 0);
 
         sal_uInt16 nCheckPos = 0;
         sal_Int16 nType = NUMBERFORMAT_DEFINED;
@@ -765,7 +765,7 @@ sal_uInt16 SwWW8ImplReader::End_Field()
                             String sOleId = '_';
                             sOleId += String::CreateFromInt32( maFieldStack.back().mnObjLocFc );
 
-                            SvStorageRef xSrc0 = pStg->OpenSotStorage(CREATE_CONST_ASC(SL::aObjectPool));
+                            SvStorageRef xSrc0 = pStg->OpenSotStorage(rtl::OUString(SL::aObjectPool));
                             SvStorageRef xSrc1 = xSrc0->OpenSotStorage( sOleId, STREAM_READ );
 
                             // Store it now!
@@ -1147,7 +1147,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 // Wenn keins dieser Sonderzeichen enthalten ist, wird 0 zurueckgeliefert.
 void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
 {
-    String sHex( CREATE_CONST_ASC( "\\x" ));
+    rtl::OUString sHex("\\x");
     bool bAllowCr = SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_IN_TEXT )
                 || SwFltGetFlag( nFieldFlags, SwFltControlStack::ALLOW_FLD_CR );
     sal_Unicode cChar;
@@ -1215,7 +1215,7 @@ void SwWW8ImplReader::MakeTagString( String& rStr, const String& rOrg )
 
 void SwWW8ImplReader::InsertTagField( const sal_uInt16 nId, const String& rTagText )
 {
-    String aName( CREATE_CONST_ASC( "WwFieldTag" ) );
+    String aName(rtl::OUString("WwFieldTag"));
     if( SwFltGetFlag( nFieldFlags, SwFltControlStack::TAGS_DO_ID ) ) // Nummer?
         aName += String::CreateFromInt32( nId );                    // ausgeben ?
 
@@ -1388,7 +1388,7 @@ long SwWW8ImplReader::MapBookmarkVariables(const WW8FieldDesc* pF,
     }
     else
     {
-        sName = CREATE_CONST_ASC("WWSetBkmk");
+        sName = rtl::OUString("WWSetBkmk");
         nNo = pReffingStck->aFieldVarNames.size()+1;
         sName += String::CreateFromInt32(nNo);
         nNo += pPlcxMan->GetBook()->GetIMax();
@@ -1509,7 +1509,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr )
 eF_ResT SwWW8ImplReader::Read_F_ANumber( WW8FieldDesc*, String& rStr )
 {
     if( !pNumFldType ){     // 1. Mal
-        SwSetExpFieldType aT( &rDoc, CREATE_CONST_ASC("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
+        SwSetExpFieldType aT( &rDoc, rtl::OUString("AutoNr"), nsSwGetSetExpType::GSE_SEQ );
         pNumFldType = rDoc.InsertFldType( aT );
     }
     SwSetExpField aFld( (SwSetExpFieldType*)pNumFldType, aEmptyStr,
@@ -2011,7 +2011,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
     }
     else
     {
-        rDoc.InsertString(*pPaM, CREATE_CONST_ASC("###"));
+        rDoc.InsertString(*pPaM, rtl::OUString("###"));
     }
 
     return FLD_OK;
@@ -3301,7 +3301,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
                                         if ( aIt != aPattern.end() )
                                         {
                                             SwFormToken aNumberEntrySeparator( TOKEN_TEXT );
-                                            aNumberEntrySeparator.sText = String::CreateFromAscii(" ");
+                                            aNumberEntrySeparator.sText = rtl::OUString(" ");
                                             aPattern.insert( ++aIt, aNumberEntrySeparator );
                                             pForm->SetPattern( nStyleLevel, aPattern );
                                         }
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index ec13da0a2a09..9dd317aa7e9f 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -443,11 +443,10 @@ pGraphicHelper = SvXMLGraphicHelper::Create( xStg,
             if( !pStream->GetError() )
             {
                 uno::Reference < beans::XPropertySet > xSet( xStm, UNO_QUERY );
-                String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
                 OUString aMime( RTL_CONSTASCII_USTRINGPARAM("application/binary") );
                 uno::Any aAny2;
                 aAny2 <<= aMime;
-                xSet->setPropertyValue( aPropName, aAny2 );
+                xSet->setPropertyValue( rtl::OUString("MediaType"), aAny2 );
                 pDoc->WriteLayoutCache( *pStream );
             }
 
@@ -548,11 +547,10 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
         if( !xSet.is() )
             return sal_False;
 
-        String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
         OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
         uno::Any aAny;
         aAny <<= aMime;
-        xSet->setPropertyValue( aPropName, aAny );
+        xSet->setPropertyValue( rtl::OUString("MediaType"), aAny );
 
         OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
         if( bPlainStream )
@@ -612,9 +610,7 @@ sal_Bool SwXMLWriter::WriteThroughComponent(
 
     // get component
     uno::Reference< io::XActiveDataSource > xSaxWriter(
-        rFactory->createInstance(
-            String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(
-                "com.sun.star.xml.sax.Writer")) ),
+        rFactory->createInstance(rtl::OUString("com.sun.star.xml.sax.Writer")),
         UNO_QUERY );
     OSL_ENSURE( xSaxWriter.is(), "can't instantiate XML writer" );
     if(!xSaxWriter.is())
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index ad1ddb210968..70c27f20f236 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -2008,8 +2008,7 @@ int SwTransferable::_PasteDDE( TransferableDataHelper& rData,
         int nRet = rData.GetGraphic( nFormat, aGrf );
         if( nRet )
         {
-            String sLnkTyp( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( "DDE" )));
+            rtl::OUString sLnkTyp("DDE");
             if ( bReReadGrf )
                 rWrtShell.ReRead( aCmd, sLnkTyp, &aGrf );
             else
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 700f04acbaec..0c5bc7d0c416 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -237,8 +237,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
 
     try
     {
-        String sFldName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM(
-                            "com.sun.star.text.FieldMaster.User." )));
+        rtl::OUString sFldName("com.sun.star.text.FieldMaster.User.");
         OUString uCntName( rtl::OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT )));
         for( const _SwLabItemMap* p = aArr; p->pName; ++p )
         {
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 88fdbf91f0ea..a23267a942a6 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -382,8 +382,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox )
         {
             aValueED.SetText(aEmptyStr);
             if (bCond)
-                aConditionED.SetText( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( "TRUE" )));
+                aConditionED.SetText(rtl::OUString("TRUE"));
             else
                 aConditionED.SetText(aEmptyStr);
         }
@@ -494,8 +493,7 @@ IMPL_LINK_NOARG(SwFldDBPage, ModifyHdl)
 
 void    SwFldDBPage::FillUserData()
 {
-    String sData( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
+    String sData(rtl::OUString(USER_DATA_VERSION));
     sData += ';';
     sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
 
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index e9be1807596d..911daa9bea27 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -477,8 +477,7 @@ sal_uInt16 SwFldDokInfPage::GetGroup()
 
 void    SwFldDokInfPage::FillUserData()
 {
-    String sData( String::CreateFromAscii(
-                            RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
+    String sData(rtl::OUString(USER_DATA_VERSION));
     sData += ';';
     SvLBoxEntry* pEntry = aTypeTLB.FirstSelected();
     sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 461ea9d9fc1d..bf9c12caed20 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -656,8 +656,7 @@ sal_uInt16 SwFldDokPage::GetGroup()
 
 void    SwFldDokPage::FillUserData()
 {
-    String sData( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
+    String sData(rtl::OUString(USER_DATA_VERSION));
     sData += ';';
     sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 9914d1626428..ab281eaef296 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -661,8 +661,7 @@ sal_uInt16 SwFldFuncPage::GetGroup()
 
 void    SwFldFuncPage::FillUserData()
 {
-    String sData( String::CreateFromAscii(
-                        RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
+    String sData(rtl::OUString(USER_DATA_VERSION));
     sData += ';';
     sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 71c2c7396e85..710fde8e92de 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -1487,8 +1487,7 @@ void SwFldMgr::UpdateCurFld(sal_uLong nFormat,
             if( SVX_NUM_CHAR_SPECIAL == nFormat )
             {
                 ((SwPageNumberField*)pCurFld)->SetUserString( sPar2 );
-                sPar2 = String::CreateFromAscii(
-                    RTL_CONSTASCII_STRINGPARAM("-1"));
+                sPar2 = rtl::OUString("-1");
             }
             else
             {
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index b4764f2c051f..2e96d4fc1935 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -988,8 +988,7 @@ sal_uInt16 SwFldRefPage::GetGroup()
 
 void    SwFldRefPage::FillUserData()
 {
-    String sData( String::CreateFromAscii(
-                    RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION )));
+    String sData(rtl::OUString(USER_DATA_VERSION));
     sData += ';';
     sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos();
     if( LISTBOX_ENTRY_NOTFOUND == nTypeSel )
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index c647089ccd31..e9af11339e75 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -81,9 +81,6 @@ using namespace com::sun::star::ui::dialogs;
 using ::rtl::OUString;
 
 
-#define INDEX_SECTION_NAME String::CreateFromAscii( \
-                            RTL_CONSTASCII_STRINGPARAM( "IndexSection_" ))
-
 #ifdef SW_PROP_NAME_STR
 #undef SW_PROP_NAME_STR
 #endif
@@ -155,7 +152,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl)
          uno::Reference< container::XNameAccess >  xSections =
                                         xSectionSupplier->getTextSections();
 
-        String sSectionName( INDEX_SECTION_NAME );
+        rtl::OUString sSectionName("IndexSection_");
         for(int i = 0; i < 7; ++i )
         {
             String sTmp( sSectionName ); sTmp += String::CreateFromInt32(i);
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 47f75aeddec3..4daba7a7d28d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -106,8 +106,7 @@ static const sal_Unicode aDeliEnd    = ']'; // for the form
 #define POS_TABLE   2
 #define POS_FRAME   3
 
-#define IDX_FILE_EXTENSION String::CreateFromAscii( \
-                            RTL_CONSTASCII_STRINGPARAM( "*.sdi" ))
+#define IDX_FILE_EXTENSION rtl::OUString("*.sdi")
 
 String lcl_CreateAutoMarkFileDlg( const String& rURL,
                                 const String& rFileString, sal_Bool bOpen )
@@ -509,8 +508,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
         if(!pExampleFrame && !bExampleCreated)
         {
             bExampleCreated = sal_True;
-            String sTemplate( String::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM("internal")) );
+            String sTemplate(rtl::OUString("internal"));
             sTemplate += INET_PATH_TOKEN;
             sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") );
             String sTemplateWithoutExt( sTemplate );
@@ -3347,9 +3345,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
     const long nSpace = aCtrlParentWin.GetSizePixel().Width();
 #if OSL_DEBUG_LEVEL > 1
     //find all start/end positions and print it
-    String sMessage(String::CreateFromAscii("Space: "));
+    String sMessage(rtl::OUString("Space: "));
     sMessage += String::CreateFromInt32(nSpace);
-    sMessage += String::CreateFromAscii(" | ");
+    sMessage += rtl::OUString(" | ");
 
     for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
     {
@@ -3359,9 +3357,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
         long nDebugWidth = pDebugCtrl->GetSizePixel().Width();
 
         sMessage += String::CreateFromInt32( nDebugXPos );
-        sMessage += String::CreateFromAscii(" ");
+        sMessage += rtl::OUString(" ");
         sMessage += String::CreateFromInt32(nDebugXPos + nDebugWidth);
-        sMessage += String::CreateFromAscii(" | ");
+        sMessage += rtl::OUString(" | ");
     }
 
 #endif
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 95e6f547bbb8..90e4d60ce5fe 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -88,8 +88,7 @@ String lcl_CheckFileName( const String& rNewFilePath,
     {
         String rSG = SwGlossaries::GetExtension();
         //generate generic name
-        utl::TempFile aTemp(
-            String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "group" )),
+        utl::TempFile aTemp(rtl::OUString("group"),
             &rSG, &rNewFilePath );
         aTemp.EnableKillingFile();
 
@@ -104,7 +103,7 @@ String lcl_CheckFileName( const String& rNewFilePath,
 ------------------------------------------------------------------------*/
 String  SwGlossaries::GetDefName()
 {
-    return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "standard" ));
+    return rtl::OUString("standard");
 
 }
 
@@ -486,7 +485,7 @@ void SwGlossaries::ShowError()
 
 String SwGlossaries::GetExtension()
 {
-    return String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( ".bau" ));
+    return rtl::OUString(".bau");
 }
 
 void SwGlossaries::RemoveFileFromList( const String& rGroup )
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index ed2cfc559910..ca23cb7d09dc 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -716,8 +716,7 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollbar *, pScrollbar )
                     pWrtShell->GetContentAtPos( aPos, aCnt );
                     if( aCnt.sStr.Len() )
                     {
-                        sPageStr += String::CreateFromAscii(
-                                        RTL_CONSTASCII_STRINGPARAM( "  - " ));
+                        sPageStr += rtl::OUString("  - ");
                         sPageStr.Insert( aCnt.sStr, 0, 80 );
                         sPageStr.SearchAndReplaceAll( '\t', ' ' );
                         sPageStr.SearchAndReplaceAll( 0x0a, ' ' );