ByteString->rtl::OUStringToOString

4 files changed, 8 insertions, 8 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index ec41d0e777ab..62a4f1417a89 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -295,8 +295,8 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                         int nPos = file->SearchBackward( '.' );
                         if( file->Copy( 0, nPos ) == String( aPPD ) )
                         {
-                            ByteString aSysPath( aFile, aEncoding );
-                            if( unlink( aSysPath.GetBuffer() ) )
+                            rtl::OString aSysPath(rtl::OUStringToOString(aFile, aEncoding));
+                            if (unlink(aSysPath.getStr()))
                             {
                                 String aText( PaResId( RID_ERR_REMOVEDRIVERFAILED ) );
                                 aText.SearchAndReplace( String::CreateFromAscii( "%s1" ), m_aDriverBox.GetSelectEntry( i ) );
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 4303757628ba..5dc0864d276c 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -176,7 +176,7 @@ void CommandStore::setCommands(
         nWritten--;
     }
     for( nWritten = 0, it = aWriteList.begin(); it != aWriteList.end(); ++it, ++nWritten )
-        rConfig.WriteKey( rtl::OString::valueOf(nWritten), ByteString( *it, RTL_TEXTENCODING_UTF8 ) );
+        rConfig.WriteKey( rtl::OString::valueOf(nWritten), rtl::OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
 }
 
 
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index 7e928665b5cd..f26283c04260 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -384,7 +384,7 @@ FontImportDialog::~FontImportDialog()
 {
     Config& rPadminRC( getPadminRC() );
     rPadminRC.SetGroup( "FontImport" );
-    rPadminRC.WriteKey( "FromPath", ByteString( m_aFromDirEdt.GetText(), RTL_TEXTENCODING_UTF8 ) );
+    rPadminRC.WriteKey( "FromPath", rtl::OUStringToOString(m_aFromDirEdt.GetText(), RTL_TEXTENCODING_UTF8) );
 }
 
 void FontImportDialog::importFontsFailed( ::psp::PrintFontManager::ImportFontCallback::FailCondition eReason )
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index cde0720aae28..972e2b76cb7f 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -109,7 +109,7 @@ void PPDImportDialog::Import()
 
     Config& rConfig = getPadminRC();
     rConfig.SetGroup( PPDIMPORT_GROUP );
-    rConfig.WriteKey( "LastDir", ByteString( aImportPath, RTL_TEXTENCODING_UTF8 ) );
+    rConfig.WriteKey( "LastDir", rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
 
     int nEntries = m_aPathBox.GetEntryCount();
     while( nEntries-- )
@@ -118,7 +118,7 @@ void PPDImportDialog::Import()
     if( nEntries < 0 )
     {
         sal_Int32 nNextEntry = rConfig.ReadKey("NextEntry").toInt32();
-        rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), ByteString( aImportPath, RTL_TEXTENCODING_UTF8 ) );
+        rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
         nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0;
         rConfig.WriteKey( "NextEntry", rtl::OString::valueOf(nNextEntry) );
         m_aPathBox.InsertEntry( aImportPath );
@@ -221,8 +221,8 @@ IMPL_LINK( PPDImportDialog, ModifyHdl, ComboBox*, pListBox )
 {
     if( pListBox == &m_aPathBox )
     {
-        ByteString aDir( m_aPathBox.GetText(), osl_getThreadTextEncoding() );
-        if( ! access( aDir.GetBuffer(), F_OK ) )
+        rtl::OString aDir(rtl::OUStringToOString(m_aPathBox.GetText(), osl_getThreadTextEncoding()));
+        if (!access( aDir.getStr(), F_OK))
             Import();
     }
     return 0;