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

Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c

13 files changed, 24 insertions, 28 deletions

diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 0e3af3134610..628f7f94c955 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -354,9 +354,8 @@ void SvxHyperlinkNewDocTp::DoApply ()
 
                     // create items
                     SfxStringItem aName( SID_FILE_NAME, aStrDocName );
-                    SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii(
-                                                RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
-                    SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) );
+                    SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") );
+                    SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") );
 
                     String aStrFlags ( sal_Unicode('S') );
                     if ( maRbtEditLater.IsChecked() )
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index ea7f2ad19af2..8957a142c1b8 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -427,10 +427,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl)
     /////////////////////////////////////////////////
     // Open URL if available
 
-    SfxStringItem aName( SID_FILE_NAME, UniString::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM( "http://" ) ) );
-    SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
+    SfxStringItem aName( SID_FILE_NAME, rtl::OUString("http://") );
+    SfxStringItem aRefererItem( SID_REFERER, rtl::OUString("private:user") );
     SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
     SfxBoolItem aSilent( SID_SILENT, sal_True );
     SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 0f84219c976e..476ab9abf0c1 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -170,7 +170,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const
     {
         if ( maEdSubject.GetText() != aEmptyStr )
         {
-            String aQuery = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "subject=" ) );
+            String aQuery = rtl::OUString("subject=");
             aQuery.Append( maEdSubject.GetText() );
             aURL.SetParam(aQuery);
         }
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 0328a592f359..4c47b37fa567 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -670,7 +670,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage )
     // adjust language
     String aStr( GetText() );
     aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 );
-    aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) );
+    aStr.Append( rtl::OUString(" (") );
     aStr += SvtLanguageTable().GetLanguageString( nLanguage );
     aStr.Append( sal_Unicode( ')' ) );
     SetText( aStr );    // set window title
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5dac4d4ff6b8..4c0f03b0d009 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -76,11 +76,11 @@ using namespace svx;
 #define ITEMID_TYPE       1
 #define ITEMID_PATH       2
 
-#define POSTFIX_INTERNAL    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_internal" ) )
-#define POSTFIX_USER        String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_user" ) )
-#define POSTFIX_WRITABLE    String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_writable" ) )
-#define VAR_ONE             String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "%1" ) )
-#define IODLG_CONFIGNAME    String(DEFINE_CONST_UNICODE("FilePicker_Save"))
+#define POSTFIX_INTERNAL    rtl::OUString("_internal")
+#define POSTFIX_USER        rtl::OUString("_user")
+#define POSTFIX_WRITABLE    rtl::OUString("_writable")
+#define VAR_ONE             rtl::OUString("%1")
+#define IODLG_CONFIGNAME    rtl::OUString("FilePicker_Save")
 
 // struct OptPath_Impl ---------------------------------------------------
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 2d13aa761b43..8936ebc2c55a 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -170,8 +170,7 @@ sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, sal_uInt16 nLevelMask)
 Font& lcl_GetDefaultBulletFont()
 {
     static sal_Bool bInit = 0;
-    static Font aDefBulletFont( UniString::CreateFromAscii(
-                                RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
+    static Font aDefBulletFont( rtl::OUString("StarSymbol"),
                                 String(), Size( 0, 14 ) );
     if(!bInit)
     {
@@ -1287,7 +1286,7 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
             aLevelLB.InsertEntry( UniString::CreateFromInt32(i));
         if(pSaveNum->GetLevelCount() > 1)
         {
-            String sEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1 - " ) ) );
+            String sEntry(rtl::OUString("1 - "));
             sEntry += UniString::CreateFromInt32( pSaveNum->GetLevelCount() );
             aLevelLB.InsertEntry(sEntry);
             aLevelLB.SelectEntry(sEntry);
@@ -2712,7 +2711,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     Point aPos(250,0);
 
     pDebugFixedText->SetPosSizePixel(aPos, aSize);
-    pDebugFixedText->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Das ist ein Debug-Text" ) ) );
+    pDebugFixedText->SetText(rtl::OUString("Das ist ein Debug-Text"));
 #endif
 
     aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
@@ -3045,7 +3044,7 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
             aLevelLB.InsertEntry(UniString::CreateFromInt32(i));
         if(pSaveNum->GetLevelCount() > 1)
         {
-            String sEntry( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "1 - ") ) );
+            String sEntry(rtl::OUString("1 - "));
             sEntry.Append( UniString::CreateFromInt32( pSaveNum->GetLevelCount() ) );
             aLevelLB.InsertEntry(sEntry);
             aLevelLB.SelectEntry(sEntry);
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index e29dd2c36fc8..ea2c8120f657 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -2244,7 +2244,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
         if( aTsbStepCount.GetState() == STATE_NOCHECK )
         {
             if( aNumFldStepCount.GetText().Len() == 0 )
-                aNumFldStepCount.SetText( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "64") ));
+                aNumFldStepCount.SetText(rtl::OUString("64"));
 
             aNumFldStepCount.Enable();
         }
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 01adb764584b..80880f172a58 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -706,7 +706,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
 {
     ResMgr& rMgr = CUI_MGR();
-    SvxOpenGraphicDialog aDlg( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Import" ) ) );
+    SvxOpenGraphicDialog aDlg(rtl::OUString("Import"));
     aDlg.EnableLink(sal_False);
 
     if( !aDlg.Execute() )
@@ -1014,7 +1014,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
         aFile.Append( pBitmapList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sob" ) ) );
+            aFile.SetExtension(rtl::OUString("sob"));
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index bf027bc62195..8f5cfc068612 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -990,7 +990,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
             case CM_RGB:
             {
                 String aStr( aLbColorModel.GetSelectEntry() );
-                String aColorStr( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "~X" ) ) );
+                String aColorStr(rtl::OUString("~X"));
                 xub_StrLen nIdx = 1;
                 aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
                 aFtColorModel1.SetText( aColorStr );
@@ -1035,7 +1035,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
             case CM_CMYK:
             {
                 String aStr( aLbColorModel.GetSelectEntry() );
-                String aColorStr( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "~X" ) ) );
+                String aColorStr(rtl::OUString("~X"));
                 xub_StrLen nIdx = 1;
                 aColorStr.SetChar( nIdx, aStr.GetChar( 0 ) );
                 aFtColorModel1.SetText( aColorStr );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 39802fcccf9f..46b60ee9b291 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -734,7 +734,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
         aFile.Append( pGradientList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sog" ) ) );
+            aFile.SetExtension(rtl::OUString("sog"));
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 678763eeb6ff..e86eecce54f6 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -770,7 +770,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
         aFile.Append( pHatchingList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soh" ) ) );
+            aFile.SetExtension(rtl::OUString("soh"));
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 72563d2de5c6..825e9b74c07e 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -834,7 +834,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
         aFile.Append( pDashList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "sod" ) ) );
+            aFile.SetExtension(rtl::OUString("sod"));
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 460b9ed3dcd0..e2d8c0fdf1d0 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -633,7 +633,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
         aFile.Append( pLineEndList->GetName() );
 
         if( aFile.getExtension().isEmpty() )
-            aFile.SetExtension( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "soe" ) ) );
+            aFile.SetExtension(rtl::OUString("soe"));
     }
 
     aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );