From bccf34c19ae022b67565e212fa4ec0d5213947de Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 2 Jul 2012 16:02:38 +0100
Subject: ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
---
 padmin/source/adddlg.cxx   | 12 ++++++------
 padmin/source/padialog.cxx |  2 +-
 padmin/source/pamain.cxx   |  2 +-
 padmin/source/prtsetup.cxx |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'padmin')

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index f32ee33e8836..e8b5941b77bb 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -206,7 +206,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                 if( aDriver.EqualsIgnoreCaseAscii( "SGENPRT" ) )
                 {
                     String aText( PaResId( RID_ERR_REMOVESGENPRT ) );
-                    aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
+                    aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
                     ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText );
                     aErrorBox.SetText( m_aRemStr );
                     aErrorBox.Execute();
@@ -219,7 +219,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                 if( aDefInfo.m_aDriverName == aPPD )
                 {
                     String aText( PaResId( RID_ERR_REMOVEDEFAULTDRIVER ) );
-                    aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
+                    aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
                     ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText );
                     aErrorBox.SetText( m_aRemStr );
                     aErrorBox.Execute();
@@ -239,7 +239,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                 if( it != aPrinters.end() )
                 {
                     String aText( PaResId( RID_QUERY_DRIVERUSED ) );
-                    aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
+                    aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
                     QueryBox aBox( this, WB_YES_NO | WB_DEF_NO, aText );
                     aBox.SetText( m_aRemStr );
                     if( aBox.Execute() == RET_NO )
@@ -248,7 +248,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                 else
                 {
                     String aText( PaResId( RID_QUERY_REMOVEDRIVER ) );
-                    aText.SearchAndReplace( String::CreateFromAscii( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
+                    aText.SearchAndReplace( rtl::OUString( "%s" ), m_aDriverBox.GetSelectEntry( i ) );
                     QueryBox aBox( this, WB_YES_NO | WB_DEF_NO, aText );
                     aBox.SetText( m_aRemStr );
                     if( aBox.Execute() == RET_NO )
@@ -290,8 +290,8 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                             if (unlink(aSysPath.getStr()))
                             {
                                 String aText( PaResId( RID_ERR_REMOVEDRIVERFAILED ) );
-                                aText.SearchAndReplace( String::CreateFromAscii( "%s1" ), m_aDriverBox.GetSelectEntry( i ) );
-                                aText.SearchAndReplace( String::CreateFromAscii( "%s2" ), aFile );
+                                aText.SearchAndReplace( rtl::OUString( "%s1" ), m_aDriverBox.GetSelectEntry( i ) );
+                                aText.SearchAndReplace( rtl::OUString( "%s2" ), aFile );
                                 ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aText );
                                 aErrorBox.SetText( m_aRemStr );
                                 aErrorBox.Execute();
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 40e4d6afac6c..760b78730e08 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -435,7 +435,7 @@ void SpaPrinterController::printPage( int ) const
     for( unsigned int i = 0; i < SAL_N_ELEMENTS(aResIds); i++ )
     {
         if( aResIds[i].pDirect )
-            aToken = String::CreateFromAscii( aResIds[i].pDirect );
+            aToken = rtl::OUString::createFromAscii(aResIds[i].pDirect);
         else
             aToken = String( PaResId( aResIds[i].nResId ) );
         nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 3e0d1cec0eec..bbfd616ed4c4 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -70,7 +70,7 @@ sal_uInt16 MyApp::Exception( sal_uInt16 nError )
     switch( nError & EXC_MAJORTYPE )
     {
         case EXC_RSCNOTLOADED:
-            Abort( String::CreateFromAscii( "Error: could not load language resources.\nPlease check your installation.\n" ) );
+            Abort( rtl::OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) );
             break;
     }
     return 0;
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 445a8071df6a..936322baa421 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -297,7 +297,7 @@ void RTSPaperPage::update()
 
     // input slots
     if( m_pParent->m_aJobData.m_pParser &&
-        (pKey = m_pParent->m_aJobData.m_pParser->getKey( String::CreateFromAscii( "InputSlot" ) )) )
+        (pKey = m_pParent->m_aJobData.m_pParser->getKey( rtl::OUString("InputSlot") )) )
     {
         m_pParent->insertAllPPDValues( m_aSlotBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
-- 
cgit