ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

21 files changed, 47 insertions, 55 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 6ad0c365ebfd..a727e41b6698 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1455,7 +1455,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
     // change te description of the radio button, which switch to the module
     // dependend accelerator configuration
     String sButtonText = aModuleButton.GetText();
-    sButtonText.SearchAndReplace(String::CreateFromAscii("$(MODULE)"), m_sModuleUIName);
+    sButtonText.SearchAndReplace(rtl::OUString("$(MODULE)"), m_sModuleUIName);
     aModuleButton.SetText(sButtonText);
 
     if (m_xModule.is())
@@ -1540,7 +1540,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
     }
     else
     {
-        String aRet( String::CreateFromAscii("Symbols: ") );
+        String aRet(rtl::OUString("Symbols: "));
         xub_StrLen nPos = sCommand.SearchAscii(".uno:InsertSymbol?Symbols:string=");
         if ( nPos == 0 )
         {
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index dc4571adf5e2..85f353d655e8 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -948,7 +948,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                                 }
 
                                 Any value =
-                                    xPropSet->getPropertyValue( String::CreateFromAscii( "URI" ) );
+                                    xPropSet->getPropertyValue( rtl::OUString("URI") );
                                 value >>= uri;
 
                                 String* pScriptURI = new String( uri );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index ca780f8230f3..458709259dc5 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -523,7 +523,7 @@ IMPL_LINK_NOARG(SvxCharMapData, CharHighlightHdl)
         snprintf( aBuf, sizeof(aBuf), "U+%04X", static_cast<unsigned>(cChar) );
         if( cChar < 0x0100 )
             snprintf( aBuf+6, sizeof(aBuf)-6, " (%u)", static_cast<unsigned>(cChar) );
-        aText = String::CreateFromAscii( aBuf );
+        aText = rtl::OUString::createFromAscii(aBuf);
     }
     aCharCodeText.SetText( aText );
 
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 3374d13b5a3f..63b83b468ac8 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -86,7 +86,7 @@ URLDlg::URLDlg( Window* pWindow, const String& rURL, const String& rAlternativeT
         maCbbTargets.InsertEntry( *rTargetList[ i ] );
 
     if( !rTarget.Len() )
-        maCbbTargets.SetText( String::CreateFromAscii( "_self" ) );
+        maCbbTargets.SetText( rtl::OUString("_self") );
     else
         maCbbTargets.SetText( rTarget );
 }
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 8957a142c1b8..b310ddb2ecb4 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -346,10 +346,8 @@ void SvxHyperlinkInternetTp::RemoveImproperProtocol(const String& aProperScheme)
 String SvxHyperlinkInternetTp::GetSchemeFromButtons() const
 {
     if( maRbtLinktypFTP.IsChecked() )
-    {
-        return String::CreateFromAscii( INET_FTP_SCHEME );
-    }
-    return String::CreateFromAscii( INET_HTTP_SCHEME );
+        return rtl::OUString(INET_FTP_SCHEME);
+    return rtl::OUString(INET_HTTP_SCHEME);
 }
 
 INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 476ab9abf0c1..49b43f7340c4 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -250,10 +250,8 @@ void SvxHyperlinkMailTp::RemoveImproperProtocol(const String& aProperScheme)
 String SvxHyperlinkMailTp::GetSchemeFromButtons() const
 {
     if( maRbtNews.IsChecked() )
-    {
-        return String::CreateFromAscii( INET_NEWS_SCHEME );
-    }
-    return String::CreateFromAscii( INET_MAILTO_SCHEME );
+        return rtl::OUString(INET_NEWS_SCHEME);
+    return rtl::OUString(INET_MAILTO_SCHEME);
 }
 
 INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 33533a11c449..4a1a2ecb0ef6 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -531,23 +531,23 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL )
     {
         if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTP_SCHEME, 0, 7 ) )
         {
-            aStrScheme = String::CreateFromAscii( INET_HTTP_SCHEME );
+            aStrScheme = rtl::OUString( INET_HTTP_SCHEME );
         }
         else if ( aStrURL.EqualsIgnoreCaseAscii( INET_HTTPS_SCHEME, 0, 8 ) )
         {
-            aStrScheme = String::CreateFromAscii( INET_HTTPS_SCHEME );
+            aStrScheme = rtl::OUString( INET_HTTPS_SCHEME );
         }
         else if ( aStrURL.EqualsIgnoreCaseAscii( INET_FTP_SCHEME, 0, 6 ) )
         {
-            aStrScheme = String::CreateFromAscii( INET_FTP_SCHEME );
+            aStrScheme = rtl::OUString( INET_FTP_SCHEME );
         }
         else if ( aStrURL.EqualsIgnoreCaseAscii( INET_MAILTO_SCHEME, 0, 7 ) )
         {
-            aStrScheme = String::CreateFromAscii( INET_MAILTO_SCHEME );
+            aStrScheme = rtl::OUString( INET_MAILTO_SCHEME );
         }
         else if ( aStrURL.EqualsIgnoreCaseAscii( INET_NEWS_SCHEME, 0, 5 ) )
         {
-            aStrScheme = String::CreateFromAscii( INET_NEWS_SCHEME );
+            aStrScheme = rtl::OUString( INET_NEWS_SCHEME );
         }
     }
     else
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index ac3bf0d22bd7..3137db1dce50 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -58,7 +58,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
     if ( IsClassPathMode() )
     {
         aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
-        aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+        aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") );
     }
 
     if ( aDlg.Execute() == ERRCODE_NONE )
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index ff6816026c4e..587a10d6c5d0 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -104,7 +104,7 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
 
         if ( aType.Len() )
         {
-            aText += String::CreateFromAscii( " (" );
+            aText += rtl::OUString( " (" );
             aText += aType;
             aText += ')';
             pPluginNames[nIndex] = aText;
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 3a8b0757968a..3a71808b7254 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -535,7 +535,7 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, ::rtl::OUString languag
     // must be a neater way to deal with the strings than as above
     // append the language to the dialog title
     String winTitle( GetText() );
-    winTitle.SearchAndReplace( String::CreateFromAscii( "%MACROLANG" ), m_sLanguage );
+    winTitle.SearchAndReplace( rtl::OUString( "%MACROLANG" ), m_sLanguage );
     SetText( winTitle );
 
     aScriptsBox.SetSelectHdl( LINK( this, SvxScriptOrgDialog, ScriptSelectHdl ) );
@@ -614,8 +614,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
             return;
         }
 
-        ::rtl::OUString sName;
-        sName = String::CreateFromAscii("Editable")  ;
+        ::rtl::OUString sName("Editable")  ;
 
         if ( getBoolProperty( xProps, sName ) )
         {
@@ -626,7 +625,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
             aEditButton.Disable();
         }
 
-        sName = String::CreateFromAscii("Deletable")  ;
+        sName = rtl::OUString("Deletable")  ;
 
         if ( getBoolProperty( xProps, sName ) )
         {
@@ -637,7 +636,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
             aDelButton.Disable();
         }
 
-        sName = String::CreateFromAscii("Creatable")  ;
+        sName = rtl::OUString("Creatable")  ;
 
         if ( getBoolProperty( xProps, sName ) )
         {
@@ -648,7 +647,7 @@ void SvxScriptOrgDialog::CheckButtons( Reference< browse::XBrowseNode >& node )
             aCreateButton.Disable();
         }
 
-        sName = String::CreateFromAscii("Renamable")  ;
+        sName = rtl::OUString("Renamable")  ;
 
         if ( getBoolProperty( xProps, sName ) )
         {
@@ -765,7 +764,7 @@ IMPL_LINK( SvxScriptOrgDialog, ButtonHdl, Button *, pButton )
                         mspNode.set( mspUserData->GetNode() , UNO_QUERY );
                         pParent = aScriptsBox.GetParent( pParent );
                     }
-                    xProp->getPropertyValue( String::CreateFromAscii("URI" ) ) >>= tmpString;
+                    xProp->getPropertyValue( rtl::OUString("URI" ) ) >>= tmpString;
                     const String scriptURL( tmpString );
 
                     if ( mspNode.is() )
@@ -1211,10 +1210,10 @@ sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >&
 String SvxScriptOrgDialog::getListOfChildren( Reference< browse::XBrowseNode > node, int depth )
 {
     String result;
-    result.Append( String::CreateFromAscii( "\n" ) );
+    result.Append( rtl::OUString( "\n" ) );
     for( int i=0;i<=depth;i++ )
     {
-        result.Append( String::CreateFromAscii( "\t" ) );
+        result.Append( rtl::OUString( "\t" ) );
     }
     result.Append( String( node->getName() ) );
 
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 4c47b37fa567..c8cb1b1239ff 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -63,8 +63,6 @@
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
-#define A2S(x)          String::CreateFromAscii( x )
-
 // class LookUpComboBox_Impl --------------------------------------------------
 
 LookUpComboBox_Impl::LookUpComboBox_Impl(
@@ -208,7 +206,7 @@ SvLBoxEntry * ThesaurusAlternativesCtrl_Impl::AddEntry( sal_Int32 nVal, const St
     if (bIsHeader && nVal >= 0)
     {
         aText = String::CreateFromInt32( nVal );
-        aText += A2S( ". " );
+        aText += rtl::OUString(". ");
     }
     pEntry->AddItem( new SvLBoxString( pEntry, 0, String() ) ); // add empty column
     aText += rText;
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 320385cbf13e..a672523e553b 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -71,7 +71,7 @@ namespace svx
 
         FreeResource();
 
-        String sTemp = String::CreateFromAscii("*.odb");
+        rtl::OUString sTemp("*.odb");
         m_aURL.SetFilter(sTemp);
 
         m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) );
@@ -171,8 +171,7 @@ namespace svx
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
-        static const String s_sDatabaseType = String::CreateFromAscii("StarOffice XML (Base)");
-        const SfxFilter* pFilter = SfxFilter::GetFilterByName( s_sDatabaseType);
+        const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
         if ( pFilter )
         {
             aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 9bbe165acb2d..191799f8b855 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -124,8 +124,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
     aCheckLB.SvxSimpleTable::SetTabs( aStaticTabs, MAP_PIXEL );
 
     String sHeader(sHeader1);
-    String sTab(String::CreateFromAscii("\t"));
-    String sTabSpace(String::CreateFromAscii("\t "));
+    rtl::OUString sTab("\t");
+    rtl::OUString sTabSpace("\t ");
     sHeader += sTab;
     sHeader += sHeader2;
     sHeader += sTabSpace;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 99e49f6410b3..6317c83e9699 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -347,7 +347,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
 
     for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
     {
-        String* pData = new String( String::CreateFromAscii( aHelpFormatNames[i] ) );
+        String* pData = new String( rtl::OUString::createFromAscii( aHelpFormatNames[i] ) );
         aHelpFormatLB.SetEntryData( i, pData );
     }
 }
@@ -1287,7 +1287,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
     const String aStr( pLanguageTable->GetString( LANGUAGE_SYSTEM ) );
 
     String aUILang(aStr);
-    aUILang += String::CreateFromAscii(" - ");
+    aUILang += rtl::OUString(" - ");
     aUILang += pLanguageTable->GetString( Application::GetSettings().GetUILanguage(), true );
 
     aUserInterfaceLB.InsertEntry(aUILang);
@@ -1361,7 +1361,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
     const NfCurrencyEntry& rCurr = SvNumberFormatter::GetCurrencyEntry( LANGUAGE_SYSTEM );
     // insert SYSTEM entry
     String aDefaultCurr(aStr);
-    aDefaultCurr += String::CreateFromAscii(" - ");
+    aDefaultCurr += rtl::OUString(" - ");
     aDefaultCurr += rCurr.GetBankSymbol();
     aCurrencyLB.InsertEntry( aDefaultCurr );
     // all currencies
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index dfd413a18ba6..a8ab0d1d25d4 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1457,7 +1457,7 @@ IMPL_LINK(  SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
         rtl::OUString sUrl;
         ::utl::LocalFileHelper::ConvertPhysicalNameToURL(sPath, sUrl);
         aHelper.SetDisplayDirectory(sUrl);
-        aHelper.AddFilter( m_sDefaultFilterName, String::CreateFromAscii("*"));
+        aHelper.AddFilter( m_sDefaultFilterName, rtl::OUString("*"));
 
         if ( ERRCODE_NONE == aHelper.Execute() )
         {
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 843514b1a7eb..52b5c4b3fa62 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -910,7 +910,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
 {
     sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
-    aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), String::CreateFromAscii("*.jar;*.zip") );
+    aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") );
     String sFolder;
     if ( m_aPathList.GetSelectEntryCount() > 0 )
     {
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index a131b3997090..a3213497dad8 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -387,7 +387,7 @@ static const char * aEidToPropName[] =
 static inline String lcl_GetPropertyName( EID_OPTIONS eEntryId )
 {
     DBG_ASSERT( (unsigned int) eEntryId < SAL_N_ELEMENTS(aEidToPropName), "index out of range" );
-    return String::CreateFromAscii( aEidToPropName[ (int) eEntryId ] );
+    return rtl::OUString::createFromAscii( aEidToPropName[ (int) eEntryId ] );
 }
 
 // class OptionsUserData -------------------------------------------------
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 4c0f03b0d009..d2b5a5f026de 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -142,7 +142,7 @@ static String getCfgName_Impl( sal_uInt16 _nHandle )
         if ( Hdl2CfgMap_Impl[ nIndex ].m_nHandle == _nHandle )
         {
             // config name found
-            sCfgName = String::CreateFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
+            sCfgName = rtl::OUString::createFromAscii( Hdl2CfgMap_Impl[ nIndex ].m_pCfgName );
             break;
         }
         ++nIndex;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c63c2d1..533e8febc008 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1307,9 +1307,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                         nMinTrail = 2;
             if (xProp.is())
             {
-                xProp->getPropertyValue( String::CreateFromAscii(
+                xProp->getPropertyValue( rtl::OUString(
                         UPN_HYPH_MIN_LEADING) ) >>= nMinLead;
-                xProp->getPropertyValue( String::CreateFromAscii(
+                xProp->getPropertyValue( rtl::OUString(
                         UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail;
             }
             aHyphen.GetMinLead()  = (sal_uInt8)nMinLead;
@@ -1340,7 +1340,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                         sal_Bool bVal = sal_False;
                         if (xProp.is())
                         {
-                            xProp->getPropertyValue( String::CreateFromAscii( UPN_IS_SPELL_AUTO) ) >>= bVal;
+                            xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal;
                         }
 
                         pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal));
@@ -1489,10 +1489,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         if (xProp.is())
         {
             xProp->setPropertyValue(
-                    String::CreateFromAscii(UPN_HYPH_MIN_LEADING),
+                    rtl::OUString(UPN_HYPH_MIN_LEADING),
                     makeAny((sal_Int16) pHyphenItem->GetMinLead()) );
             xProp->setPropertyValue(
-                    String::CreateFromAscii(UPN_HYPH_MIN_TRAILING),
+                    rtl::OUString(UPN_HYPH_MIN_TRAILING),
                     makeAny((sal_Int16) pHyphenItem->GetMinTrail()) );
         }
         bSaveSpellCheck = sal_True;
@@ -1528,7 +1528,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
             if (xProp.is())
             {
                 xProp->setPropertyValue(
-                        String::CreateFromAscii(UPN_IS_SPELL_AUTO),
+                        rtl::OUString(UPN_IS_SPELL_AUTO),
                         makeAny(bOnlineSpelling) );
             }
         }
@@ -1702,7 +1702,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                         AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
                 }
 #ifdef DBG_UTIL
-                AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
+                AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup );
 #endif
             }
 
@@ -1718,7 +1718,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                         AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
                 }
 #ifdef DBG_UTIL
-                AddTabPage( RID_SW_TP_OPTTEST_PAGE, String::CreateFromAscii("Interner Test"), nGroup );
+                AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Interner Test"), nGroup );
 #endif
             }
         }
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index ae72075aef4c..0547aa804f79 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -683,7 +683,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
                         ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
              int ay = int(floor((float)aOrigPixelSize.Height() /
                         ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
-             sTemp += UniString::CreateFromAscii(" ");
+             sTemp += rtl::OUString(" ");
              sTemp += CUI_RESSTR( STR_PPI );
              String sPPI = UniString::CreateFromInt32(ax);
              if (abs(ax - ay) > 1) {
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e61b68748efd..d2cdb020c985 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -335,13 +335,13 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn )
         if( sScriptURI.CompareToAscii( "vnd.sun.star.script:", 20 ) == COMPARE_EQUAL )
         {
             pThis->aTbl.Insert(
-                nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_SF ) ) );
+                nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_SF ) ) );
         }
         else
         {
             OSL_ENSURE( false, "_SfxMacroTabPage::AssignDeleteHdl_Impl: this branch is *not* dead? (out of interest: tell fs, please!)" );
             pThis->aTbl.Insert(
-                nEvent, SvxMacro( sScriptURI, String::CreateFromAscii( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
+                nEvent, SvxMacro( sScriptURI, rtl::OUString( SVX_MACRO_LANGUAGE_STARBASIC ) ) );
         }
     }