convert padmin module from String to OUString

Change-Id: I1533ceef08ac3e330604115e0831fb01477aa958

15 files changed, 135 insertions, 135 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d87d7dbb2ca9..39e68dc03205 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -58,7 +58,7 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
     m_aFaxBtn.Check( sal_False );
     m_aPDFBtn.Check( sal_False );
     m_aOldBtn.Check( sal_False );
-    if( ! AddPrinterDialog::getOldPrinterLocation().Len() )
+    if( AddPrinterDialog::getOldPrinterLocation().isEmpty() )
         m_aOldBtn.Enable( sal_False );
     if( ! PrinterInfoManager::get().addOrRemovePossible() )
     {
@@ -112,7 +112,7 @@ APChooseDriverPage::APChooseDriverPage( AddPrinterDialog* pParent )
 APChooseDriverPage::~APChooseDriverPage()
 {
     for( int i = 0; i < m_aDriverBox.GetEntryCount(); i++ )
-        delete (String*)m_aDriverBox.GetEntryData( i );
+        delete (OUString*)m_aDriverBox.GetEntryData( i );
 }
 
 bool APChooseDriverPage::check()
@@ -140,7 +140,7 @@ void APChooseDriverPage::fill( PrinterInfo& rInfo )
 void APChooseDriverPage::updateDrivers( bool bRefresh, const OUString& rSelectDriver )
 {
     for( int k = 0; k < m_aDriverBox.GetEntryCount(); k++ )
-        delete (String*)m_aDriverBox.GetEntryData( k );
+        delete (OUString*)m_aDriverBox.GetEntryData( k );
     m_aDriverBox.Clear();
 
     std::list< OUString > aDrivers;
@@ -305,7 +305,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
 
 //--------------------------------------------------------------------
 
-APNamePage::APNamePage( AddPrinterDialog* pParent, const String& rInitName, DeviceKind::type eKind )
+APNamePage::APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, DeviceKind::type eKind )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_NAME ) ),
           m_aNameTxt(
                      this,
@@ -365,7 +365,7 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
           m_eKind( eKind )
 {
     FreeResource();
-    ::std::list< String > aCommands;
+    ::std::list< OUString > aCommands;
     if( m_eKind == DeviceKind::Printer )
     {
         m_aHelpBtn.Show( sal_False );
@@ -400,7 +400,7 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
     }
 
     // fill in commands
-    ::std::list< String >::iterator it;
+    ::std::list< OUString >::iterator it;
     for( it = aCommands.begin(); it != aCommands.end(); ++it )
         m_aCommandBox.InsertEntry( *it );
 
@@ -415,7 +415,7 @@ APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind
 
 APCommandPage::~APCommandPage()
 {
-    ::std::list< String > aCommands;
+    ::std::list< OUString > aCommands;
     OUString aLastCommand( m_aCommandBox.GetText() );
     for( int i = 0; i < m_aCommandBox.GetEntryCount(); i++ )
     {
@@ -534,7 +534,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
         }
 
 
-        String aUPrinter( AddPrinterDialog::uniquePrinterName(OStringToOUString(aPrinter, aEncoding)) );
+        OUString aUPrinter( AddPrinterDialog::uniquePrinterName(OStringToOUString(aPrinter, aEncoding)) );
 
         PrinterInfo aInfo;
         aInfo.m_aDriverName = OStringToOUString(aNewDriver, aEncoding);
@@ -555,7 +555,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
             aInfo.m_pParser->getMargins( OStringToOUString(aValue, aEncoding),
                                          nLeft, nRight, nTop, nBottom ) )
         {
-            const PPDKey* pKey = aInfo.m_pParser->getKey( String(  "PageSize"  ) );
+            const PPDKey* pKey = aInfo.m_pParser->getKey( OUString(  "PageSize"  ) );
             const PPDValue* pValue = pKey ? pKey->getValue( OStringToOUString(aValue, aEncoding) ) : NULL;
             if( pKey && pValue )
                 aInfo.m_aContext.setValue( pKey, pValue );
@@ -1075,7 +1075,7 @@ OUString AddPrinterDialog::uniquePrinterName( const OUString& rBase )
     return aResult;
 }
 
-String AddPrinterDialog::getOldPrinterLocation()
+OUString AddPrinterDialog::getOldPrinterLocation()
 {
     static const char* pHome = getenv( "HOME" );
     OString aFileName;
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 725c850638da..15a9a5765a2c 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -39,7 +39,7 @@ namespace DeviceKind { enum type { Printer, Fax, Pdf }; }
 
 class APTabPage : public TabPage
 {
-    String              m_aTitle;
+    OUString            m_aTitle;
 protected:
     AddPrinterDialog*   m_pParent;
 public:
@@ -48,7 +48,7 @@ public:
     // returns false if information is incomplete or invalid
     virtual bool check() = 0;
     virtual void fill( ::psp::PrinterInfo& rInfo ) = 0;
-    const String& getTitle() const { return m_aTitle; }
+    const OUString& getTitle() const { return m_aTitle; }
 };
 
 class APChooseDevicePage : public APTabPage
@@ -79,8 +79,8 @@ class APChooseDriverPage : public APTabPage
     PushButton              m_aAddBtn;
     PushButton              m_aRemBtn;
 
-    String                  m_aRemStr;
-    String                  m_aLastPrinterName;
+    OUString                m_aRemStr;
+    OUString                m_aLastPrinterName;
 
     DECL_LINK( ClickBtnHdl, PushButton* );
     DECL_LINK( DelPressedHdl, ListBox* );
@@ -101,13 +101,13 @@ class APNamePage : public APTabPage
     CheckBox                m_aDefaultBox;
     CheckBox                m_aFaxSwallowBox;
 public:
-    APNamePage( AddPrinterDialog* pParent, const String& rInitName, DeviceKind::type eKind );
+    APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, DeviceKind::type eKind );
     ~APNamePage();
 
     bool isDefault() { return m_aDefaultBox.IsChecked(); }
     bool isFaxSwallow() { return m_aFaxSwallowBox.IsChecked(); }
 
-    void setText( const String& rText ) { m_aNameEdt.SetText( rText ); }
+    void setText( const OUString& rText ) { m_aNameEdt.SetText( rText ); }
 
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
@@ -118,7 +118,7 @@ class APCommandPage : public APTabPage
     FixedText               m_aCommandTxt;
     ComboBox                m_aCommandBox;
     PushButton              m_aHelpBtn;
-    String                  m_aHelpTxt;
+    OUString                m_aHelpTxt;
     FixedText               m_aPdfDirTxt;
     Edit                    m_aPdfDirEdt;
     PushButton              m_aPdfDirBtn;
@@ -135,7 +135,7 @@ public:
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
 
-    String getPdfDir() { return m_aPdfDirEdt.GetText(); }
+    OUString getPdfDir() { return m_aPdfDirEdt.GetText(); }
 };
 
 class APOldPrinterPage : public APTabPage
@@ -230,7 +230,7 @@ public:
     ~AddPrinterDialog();
 
     static OUString uniquePrinterName( const OUString& rString );
-    static String getOldPrinterLocation();
+    static OUString getOldPrinterLocation();
 
     void enableNext( bool bEnable ) { m_aNextPB.Enable( bEnable ); }
 };
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index e1455e856e16..8756fa613690 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -35,7 +35,7 @@ using namespace padmin;
 #define PDF_PERSISTENCE_GROUP "KnowPdfCommands"
 #define MAX_COMMANDS 50
 
-void CommandStore::getSystemPrintCommands( ::std::list< String >& rCommands )
+void CommandStore::getSystemPrintCommands( ::std::list< OUString >& rCommands )
 {
     static ::std::list< OUString > aSysCommands;
     static bool bOnce = false;
@@ -50,10 +50,10 @@ void CommandStore::getSystemPrintCommands( ::std::list< String >& rCommands )
         rCommands.push_back( *it );
 }
 
-void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
+void CommandStore::getSystemPdfCommands( ::std::list< OUString >& rCommands )
 {
     static bool bOnce = false;
-    static ::std::list< String > aSysCommands;
+    static ::std::list< OUString > aSysCommands;
 
     if( ! bOnce )
     {
@@ -108,19 +108,19 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
             pclose( pPipe );
         }
     }
-    ::std::list< String >::const_iterator it;
+    ::std::list< OUString >::const_iterator it;
     for( it = aSysCommands.begin(); it != aSysCommands.end(); ++it )
         rCommands.push_back( *it );
 }
 
 
 
-void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >& rCommands )
+void CommandStore::getStoredCommands( const char* pGroup, ::std::list< OUString >& rCommands )
 {
     Config& rConfig( getPadminRC() );
     rConfig.SetGroup( pGroup );
     sal_Int32 nKeys = rConfig.GetKeyCount();
-    ::std::list< String >::const_iterator it;
+    ::std::list< OUString >::const_iterator it;
     while( nKeys-- )
     {
         OUString aCommand( rConfig.ReadKey(OString::number(nKeys), RTL_TEXTENCODING_UTF8 ) );
@@ -136,20 +136,20 @@ void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >&
 
 void CommandStore::setCommands(
                                const char* pGroup,
-                               const ::std::list< String >& rCommands,
-                               const ::std::list< String >& rSysCommands
+                               const ::std::list< OUString >& rCommands,
+                               const ::std::list< OUString >& rSysCommands
                                )
 {
     Config& rConfig( getPadminRC() );
     rConfig.DeleteGroup( pGroup );
     rConfig.SetGroup( pGroup );
-    ::std::list< String >::const_iterator it, loop;
-    ::std::list< String > aWriteList;
+    ::std::list< OUString >::const_iterator it, loop;
+    ::std::list< OUString > aWriteList;
 
     sal_Int32 nWritten = 0;
     for( it = rCommands.begin(); it != rCommands.end(); ++it )
     {
-        if( it->Len() )
+        if( !it->isEmpty() )
         {
             for( loop = rSysCommands.begin(); loop != rSysCommands.end() && *loop != *it; ++loop )
                 ;
@@ -170,43 +170,43 @@ void CommandStore::setCommands(
 }
 
 
-void CommandStore::getPrintCommands( ::std::list< String >& rCommands )
+void CommandStore::getPrintCommands( ::std::list< OUString >& rCommands )
 {
     rCommands.clear();
     getSystemPrintCommands( rCommands );
     getStoredCommands( PRINTER_PERSISTENCE_GROUP, rCommands );
 }
 
-void CommandStore::getPdfCommands( ::std::list< String >& rCommands )
+void CommandStore::getPdfCommands( ::std::list< OUString >& rCommands )
 {
     rCommands.clear();
     getSystemPdfCommands( rCommands );
     getStoredCommands( PDF_PERSISTENCE_GROUP, rCommands );
 }
 
-void CommandStore::getFaxCommands( ::std::list< String >& rCommands )
+void CommandStore::getFaxCommands( ::std::list< OUString >& rCommands )
 {
     rCommands.clear();
     getStoredCommands( FAX_PERSISTENCE_GROUP, rCommands );
 }
 
-void CommandStore::setPrintCommands( const ::std::list< String >& rCommands )
+void CommandStore::setPrintCommands( const ::std::list< OUString >& rCommands )
 {
-    ::std::list< String > aSysCmds;
+    ::std::list< OUString > aSysCmds;
     getSystemPrintCommands( aSysCmds );
     setCommands( PRINTER_PERSISTENCE_GROUP, rCommands, aSysCmds );
 }
 
-void CommandStore::setPdfCommands( const ::std::list< String >& rCommands )
+void CommandStore::setPdfCommands( const ::std::list< OUString >& rCommands )
 {
-    ::std::list< String > aSysCmds;
+    ::std::list< OUString > aSysCmds;
     getSystemPdfCommands( aSysCmds );
     setCommands( PDF_PERSISTENCE_GROUP, rCommands, aSysCmds );
 }
 
-void CommandStore::setFaxCommands( const ::std::list< String >& rCommands )
+void CommandStore::setFaxCommands( const ::std::list< OUString >& rCommands )
 {
-    ::std::list< String > aSysCmds;
+    ::std::list< OUString > aSysCmds;
     setCommands( FAX_PERSISTENCE_GROUP, rCommands, aSysCmds );
 }
 
@@ -237,11 +237,11 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
     // configuring as printer is only sensible in default print system
     PrinterInfoManager& rMgr( PrinterInfoManager::get() );
     if( rMgr.getType() == PrinterInfoManager::Default || rMgr.isCUPSDisabled() )
-        m_nPrinterEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PRINTER ) ) );
+        m_nPrinterEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_PRINTER ) ) );
     else
         m_nPrinterEntry = ~0;
-    m_nFaxEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_FAX ) ) );
-    m_nPdfEntry = m_aConfigureBox.InsertEntry( String( PaResId( RID_RTS_CMD_STR_CONFIGURE_PDF ) ) );
+    m_nFaxEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_FAX ) ) );
+    m_nPdfEntry = m_aConfigureBox.InsertEntry( OUString( PaResId( RID_RTS_CMD_STR_CONFIGURE_PDF ) ) );
 
     FreeResource();
 
@@ -301,8 +301,8 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) :
 
     m_aQuickCB.Enable( m_aExternalCB.IsChecked() );
 
-    String aString( m_aConnectedTo.GetText() );
-    aString += String( m_pParent->m_aJobData.m_aCommand );
+    OUString aString( m_aConnectedTo.GetText() );
+    aString += m_pParent->m_aJobData.m_aCommand;
     m_aConnectedTo.SetText( aString );
 
     UpdateCommands();
@@ -314,10 +314,10 @@ RTSCommandPage::~RTSCommandPage()
 
 void RTSCommandPage::save()
 {
-    String aCommand,aQuickCommand;
+    OUString aCommand,aQuickCommand;
     bool bHaveFax = m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry ? true : false;
     bool bHavePdf = m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry ? true : false;
-    ::std::list< String >::iterator it;
+    ::std::list< OUString >::iterator it;
 
     OUString aFeatures;
     sal_Int32 nIndex = 0;
@@ -352,7 +352,7 @@ void RTSCommandPage::save()
             bOldFaxSwallow = aToken.getToken( 1, '=', nPos ).startsWith( "swallow" );
         }
     }
-    ::std::list< String >* pList = &m_aPrinterCommands;
+    ::std::list< OUString >* pList = &m_aPrinterCommands;
     if( bExternalDialog )
     {
         if( !aFeatures.isEmpty() )
@@ -383,8 +383,8 @@ void RTSCommandPage::save()
     if( it == pList->end() )
         pList->push_back( aCommand );
 
-    if( aCommand != String( m_pParent->m_aJobData.m_aCommand )              ||
-        aQuickCommand != String( m_pParent->m_aJobData.m_aQuickCommand )    ||
+    if( aCommand != m_pParent->m_aJobData.m_aCommand                        ||
+        aQuickCommand != m_pParent->m_aJobData.m_aQuickCommand              ||
         ( m_bWasFax && ! bHaveFax )                                         ||
         ( ! m_bWasFax && bHaveFax )                                         ||
         ( m_bWasPdf && ! bHavePdf )                                         ||
@@ -437,8 +437,8 @@ IMPL_LINK( RTSCommandPage, ClickBtnHdl, Button*, pButton )
     }
     else if( pButton == &m_aRemovePB )
     {
-        String aEntry( m_aCommandsCB.GetText() );
-        ::std::list< String >* pList;
+        OUString aEntry( m_aCommandsCB.GetText() );
+        ::std::list< OUString >* pList;
         if( m_aConfigureBox.GetSelectEntryPos() == m_nPrinterEntry )
             pList = &m_aPrinterCommands;
         else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
@@ -452,7 +452,7 @@ IMPL_LINK( RTSCommandPage, ClickBtnHdl, Button*, pButton )
     }
     else if( pButton == &m_aHelpButton )
     {
-        String aHelpText;
+        OUString aHelpText;
         if( m_aConfigureBox.GetSelectEntryPos() == m_nPrinterEntry )
             aHelpText = m_aPrinterHelp;
         else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
@@ -488,7 +488,7 @@ IMPL_LINK( RTSCommandPage, ModifyHdl, Edit*, pEdit )
 void RTSCommandPage::UpdateCommands()
 {
     m_aCommandsCB.Clear();
-    ::std::list< String >::iterator it;
+    ::std::list< OUString >::iterator it;
     if( m_aConfigureBox.GetSelectEntryPos() == m_nPrinterEntry )
     {
         for( it = m_aPrinterCommands.begin(); it != m_aPrinterCommands.end(); ++it )
@@ -499,7 +499,7 @@ void RTSCommandPage::UpdateCommands()
         if( ! m_bWasFax )
             m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
         else
-            m_aCommandsCB.SetText( String() );
+            m_aCommandsCB.SetText( OUString() );
     }
     else if( m_aConfigureBox.GetSelectEntryPos() == m_nFaxEntry )
     {
@@ -511,7 +511,7 @@ void RTSCommandPage::UpdateCommands()
         if( m_bWasFax )
             m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
         else
-            m_aCommandsCB.SetText( String() );
+            m_aCommandsCB.SetText( OUString() );
     }
     else if( m_aConfigureBox.GetSelectEntryPos() == m_nPdfEntry )
     {
@@ -523,7 +523,7 @@ void RTSCommandPage::UpdateCommands()
         if( m_bWasPdf )
             m_aCommandsCB.SetText( m_pParent->m_aJobData.m_aCommand );
         else
-            m_aCommandsCB.SetText( String() );
+            m_aCommandsCB.SetText( OUString() );
     }
 }
 
diff --git a/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 70f57377fee5..5db1b46c713d 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.hxx
@@ -37,19 +37,19 @@ class RTSDialog;
 
 class CommandStore
 {
-    static void getStoredCommands( const char* pGroup, ::std::list< String >& rCommands );
-    static void getSystemPrintCommands( ::std::list< String >& rCommands );
-    static void getSystemPdfCommands( ::std::list< String >& rCommands );
-    static void setCommands( const char* pGroup, const ::std::list< String >& rCommands, const ::std::list< String >& rSysCommands );
+    static void getStoredCommands( const char* pGroup, ::std::list< OUString >& rCommands );
+    static void getSystemPrintCommands( ::std::list< OUString >& rCommands );
+    static void getSystemPdfCommands( ::std::list< OUString >& rCommands );
+    static void setCommands( const char* pGroup, const ::std::list< OUString >& rCommands, const ::std::list< OUString >& rSysCommands );
 
 public:
-    static void getPrintCommands( ::std::list< String >& rCommands );
-    static void getFaxCommands( ::std::list< String >& rCommands );
-    static void getPdfCommands( ::std::list< String >& rCommands );
+    static void getPrintCommands( ::std::list< OUString >& rCommands );
+    static void getFaxCommands( ::std::list< OUString >& rCommands );
+    static void getPdfCommands( ::std::list< OUString >& rCommands );
 
-    static void setPrintCommands( const ::std::list< String >& rCommands );
-    static void setFaxCommands( const ::std::list< String >& rCommands );
-    static void setPdfCommands( const ::std::list< String >& rCommands );
+    static void setPrintCommands( const ::std::list< OUString >& rCommands );
+    static void setFaxCommands( const ::std::list< OUString >& rCommands );
+    static void setPdfCommands( const ::std::list< OUString >& rCommands );
 };
 
 class RTSCommandPage : public TabPage
@@ -79,13 +79,13 @@ private:
     PushButton                      m_aHelpButton;
     PushButton                      m_aRemovePB;
 
-    ::std::list< String >           m_aPrinterCommands;
-    ::std::list< String >           m_aFaxCommands;
-    ::std::list< String >           m_aPdfCommands;
+    ::std::list< OUString >         m_aPrinterCommands;
+    ::std::list< OUString >         m_aFaxCommands;
+    ::std::list< OUString >         m_aPdfCommands;
 
-    String                          m_aFaxHelp;
-    String                          m_aPrinterHelp;
-    String                          m_aPdfHelp;
+    OUString                        m_aFaxHelp;
+    OUString                        m_aPrinterHelp;
+    OUString                        m_aPdfHelp;
 
     bool                            m_bWasFax;
     bool                            m_bWasPdf;
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index a4a72d2d2c73..023923a52472 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -99,15 +99,15 @@ void padmin::FindFiles( const OUString& rDirectory, ::std::list< OUString >& rRe
             if( aStatus.getFileType() == FileStatus::Regular ||
                 aStatus.getFileType() == FileStatus::Link )
             {
-                String aFileName = aStatus.getFileName();
+                OUString aFileName = aStatus.getFileName();
                 int nToken = comphelper::string::getTokenCount(rSuffixes, ';');
                 while( nToken-- )
                 {
                     OUString aSuffix = rSuffixes.getToken( nToken, ';' );
-                    if( aFileName.Len() > aSuffix.getLength()+1 )
+                    if( aFileName.getLength() > aSuffix.getLength()+1 )
                     {
-                        OUString aExtension = aFileName.Copy( aFileName.Len()-aSuffix.getLength() );
-                        if( aFileName.GetChar( aFileName.Len()-aSuffix.getLength()-1 ) == '.' &&
+                        OUString aExtension = aFileName.copy( aFileName.getLength()-aSuffix.getLength() );
+                        if( aFileName[ aFileName.getLength()-aSuffix.getLength()-1 ] == '.' &&
                             aExtension.equalsIgnoreAsciiCase( aSuffix ) )
                         {
                             rResult.push_back( aFileName );
@@ -180,7 +180,7 @@ long DelListBox::Notify( NotifyEvent& rEvent )
  *  QueryString
  */
 
-QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const ::std::list< String >& rChoices ) :
+QueryString::QueryString( Window* pParent, OUString& rQuery, OUString& rRet, const ::std::list< OUString >& rChoices ) :
         ModalDialog( pParent, PaResId( RID_STRINGQUERYDLG ) ),
         m_aOKButton( this, PaResId( RID_STRQRY_BTN_OK ) ),
         m_aCancelButton( this, PaResId( RID_STRQRY_BTN_CANCEL ) ),
@@ -196,7 +196,7 @@ QueryString::QueryString( Window* pParent, String& rQuery, String& rRet, const :
     {
         m_aComboBox.SetText( m_rReturnValue );
         m_aComboBox.InsertEntry( m_rReturnValue );
-        for( ::std::list<String>::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it )
+        for( ::std::list<OUString>::const_iterator it = rChoices.begin(); it != rChoices.end(); ++it )
             m_aComboBox.InsertEntry( *it );
         m_aEdit.Show( sal_False );
         m_bUseEdit = false;
@@ -235,7 +235,7 @@ sal_Bool padmin::AreYouSure( Window* pParent, int nRid )
     if( nRid == -1 )
         nRid = RID_YOU_SURE;
     QueryBox aQueryBox( pParent, WB_YES_NO | WB_DEF_NO,
-                        String( PaResId( nRid ) ) );
+                        OUString( PaResId( nRid ) ) );
     return aQueryBox.Execute() == RET_NO ? sal_False : sal_True;
 }
 
diff --git a/padmin/source/helper.hxx b/padmin/source/helper.hxx
index 0e7b6270df3a..cfaca587cbad 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.hxx
@@ -88,13 +88,13 @@ private:
     Edit         m_aEdit;
     ComboBox     m_aComboBox;
 
-    String&      m_rReturnValue;
+    OUString&    m_rReturnValue;
     bool         m_bUseEdit;
 
     DECL_LINK( ClickBtnHdl, Button* );
 
 public:
-    QueryString( Window*, String &, String &, const ::std::list< String >& rChoices = ::std::list<String>() );
+    QueryString( Window*, OUString &, OUString &, const ::std::list< OUString >& rChoices = ::std::list<OUString>() );
     // parent window, Query text, initial value
     ~QueryString();
 };
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 74a303507477..81171ee5f1e6 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -60,8 +60,8 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) :
 {
     FreeResource();
 
-    String aText( m_aDriverTxt.GetText() );
-    aText.SearchAndReplaceAscii( "%s", Button::GetStandardText( BUTTON_OK ) );
+    OUString aText( m_aDriverTxt.GetText() );
+    aText = aText.replaceFirst( "%s", Button::GetStandardText( BUTTON_OK ) );
     m_aDriverTxt.SetText( MnemonicGenerator::EraseAllMnemonicChars( aText ) );
 
     Config& rConfig = getPadminRC();
@@ -88,7 +88,7 @@ PPDImportDialog::~PPDImportDialog()
 {
     while( m_aDriverLB.GetEntryCount() )
     {
-        delete (String*)m_aDriverLB.GetEntryData( 0 );
+        delete (OUString*)m_aDriverLB.GetEntryData( 0 );
         m_aDriverLB.RemoveEntry( 0 );
     }
 }
@@ -115,7 +115,7 @@ void PPDImportDialog::Import()
     }
     while( m_aDriverLB.GetEntryCount() )
     {
-        delete (String*)m_aDriverLB.GetEntryData( 0 );
+        delete (OUString*)m_aDriverLB.GetEntryData( 0 );
         m_aDriverLB.RemoveEntry( 0 );
     }
 
@@ -133,10 +133,10 @@ void PPDImportDialog::Import()
         aProgress.setFilename( aFiles.front() );
         INetURLObject aPath( aImportPath, INET_PROT_FILE, INetURLObject::ENCODE_ALL );
         aPath.Append( aFiles.front() );
-        String aPrinterName = PPDParser::getPPDPrinterName( aPath.PathToFileName() );
+        OUString aPrinterName = PPDParser::getPPDPrinterName( aPath.PathToFileName() );
         aFiles.pop_front();
 
-        if( ! aPrinterName.Len() )
+        if( aPrinterName.isEmpty() )
         {
 #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr, "Warning: File %s has empty printer name.\n",
@@ -146,7 +146,7 @@ void PPDImportDialog::Import()
         }
 
         sal_uInt16 nPos = m_aDriverLB.InsertEntry( aPrinterName );
-        m_aDriverLB.SetEntryData( nPos, new String( aPath.PathToFileName() ) );
+        m_aDriverLB.SetEntryData( nPos, new OUString( aPath.PathToFileName() ) );
     }
 }
 
@@ -166,7 +166,7 @@ IMPL_LINK( PPDImportDialog, ClickBtnHdl, PushButton*, pButton )
 
         for( int i = 0; i < m_aDriverLB.GetSelectEntryCount(); i++ )
         {
-            INetURLObject aFile( *(String*)m_aDriverLB.GetEntryData(
+            INetURLObject aFile( *(OUString*)m_aDriverLB.GetEntryData(
                 m_aDriverLB.GetSelectEntryPos( i )
                 ), INET_PROT_FILE, INetURLObject::ENCODE_ALL );
             OUString aFromUni( aFile.GetMainURL(INetURLObject::DECODE_TO_IURI) );
diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index b94fc4b0c7ae..f222ef2fa161 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.hxx
@@ -44,7 +44,7 @@ namespace padmin {
         FixedLine           m_aPathGroup;
         FixedLine           m_aDriverGroup;
 
-        String              m_aLoadingPPD;
+        OUString            m_aLoadingPPD;
 
         DECL_LINK( ClickBtnHdl, PushButton* );
         DECL_LINK( SelectHdl, ComboBox* );
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 9327d1eed1dd..174e998db247 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -136,7 +136,7 @@ void PADialog::Init()
         m_aRenamePB.Enable( sal_False );
         m_aStdPB.Enable( sal_False );
         m_aCUPSCB.Enable( sal_False );
-        ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, String( PaResId( RID_ERR_NOWRITE ) ) );
+        ErrorBox aBox( GetParent(), WB_OK | WB_DEF_OK, OUString( PaResId( RID_ERR_NOWRITE ) ) );
         aBox.Execute();
     }
 }
@@ -155,7 +155,7 @@ long PADialog::Notify( NotifyEvent& rEv )
     {
         if( m_rPIManager.checkPrintersChanged( true ) )
         {
-            String aSelectEntry = m_aDevicesLB.GetSelectEntry();
+            OUString aSelectEntry = m_aDevicesLB.GetSelectEntry();
             UpdateDevice();
             UpdateText();
             m_aDevicesLB.SelectEntry( aSelectEntry );
@@ -176,7 +176,7 @@ void PADialog::DataChanged( const DataChangedEvent& rEv )
     }
 }
 
-String PADialog::getSelectedDevice()
+OUString PADialog::getSelectedDevice()
 {
     int nPos = m_aDevicesLB.GetSelectEntryPos();
     int nLen = (int)(sal_IntPtr)m_aDevicesLB.GetEntryData( nPos );
@@ -225,8 +225,8 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox )
 {
     if( pListBox == &m_aDevicesLB )
     {
-        String sSelect = getSelectedDevice();
-        String sDefPrt = m_rPIManager.getDefaultPrinter();
+        OUString sSelect = getSelectedDevice();
+        OUString sDefPrt = m_rPIManager.getDefaultPrinter();
         if( sDefPrt == sSelect || ! m_rPIManager.removePrinter( sSelect, true ) )
             m_aRemPB.Enable( sal_False );
         else
@@ -264,7 +264,7 @@ void PADialog::UpdateText()
     }
     else // nothing selected
     {
-        String aEmpty;
+        OUString aEmpty;
         m_aDriver.SetText( aEmpty );
         m_aCommand.SetText( aEmpty );
         m_aComment.SetText( aEmpty );
@@ -405,14 +405,14 @@ void SpaPrinterController::printPage( int ) const
                                     Size( aPaperSize.Width()-600,
                                           aPaperSize.Height()-600 ) ) );
 
-    Font aFont( String( "Courier" ), Size( 0, 400 ) );
+    Font aFont( "Courier", Size( 0, 400 ) );
     aFont.SetWeight( WEIGHT_NORMAL );
     aFont.SetItalic( ITALIC_NONE );
     pPrinter->SetFont( aFont );
 
     OUStringBuffer aPrintText(1024);
     long nWidth = 0, nMaxWidth = 0;
-    String aToken;
+    OUString aToken;
 
     static const struct
     {
@@ -434,7 +434,7 @@ void SpaPrinterController::printPage( int ) const
         if( aResIds[i].pDirect )
             aToken = OUString::createFromAscii(aResIds[i].pDirect);
         else
-            aToken = String( PaResId( aResIds[i].nResId ) );
+            aToken = PaResId( aResIds[i].nResId );
         nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
         aPrintText.append( aToken );
         aPrintText.append( (sal_Unicode)'\n' );
@@ -553,9 +553,9 @@ void SpaPrinterController::printPage( int ) const
 
 void SpaPrinterController::jobFinished( com::sun::star::view::PrintableState )
 {
-    String aInfoString( PaResId( RID_PA_TXT_TESTPAGE_PRINTED ) );
+    OUString aInfoString( PaResId( RID_PA_TXT_TESTPAGE_PRINTED ) );
     InfoBox aInfoBox( NULL, aInfoString );
-    aInfoBox.SetText( String( PaResId( RID_BXT_TESTPAGE ) ) );
+    aInfoBox.SetText( OUString( PaResId( RID_BXT_TESTPAGE ) ) );
     aInfoBox.Execute();
 }
 
@@ -567,11 +567,11 @@ void PADialog::PrintTestPage()
 
     if( pPrinter->GetName() != sPrinter )
     {
-        String aString( PaResId( RID_ERR_NOPRINTER ) );
-        aString.SearchAndReplaceAscii( "%s", sPrinter );
+        OUString aString( PaResId( RID_ERR_NOPRINTER ) );
+        aString = aString.replaceFirst( "%s", sPrinter );
 
         ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aString );
-        aErrorBox.SetText( String( PaResId( RID_BXT_ENVIRONMENT ) ) );
+        aErrorBox.SetText( PaResId( RID_BXT_ENVIRONMENT ) );
         aErrorBox.Execute();
         return;
     }
@@ -600,8 +600,8 @@ void PADialog::RemDevice()
 
     if( ! m_rPIManager.removePrinter( aPrinter ) )
     {
-        String aText( PaResId( RID_ERR_PRINTERNOTREMOVABLE ) );
-        aText.SearchAndReplace( String( "%s" ), aPrinter );
+        OUString aText( PaResId( RID_ERR_PRINTERNOTREMOVABLE ) );
+        aText = aText.replaceFirst( "%s", aPrinter );
         ErrorBox aBox( this, WB_OK | WB_DEF_OK, aText );
         aBox.Execute();
         return;
@@ -643,20 +643,20 @@ void PADialog::ConfigureDevice()
 
 void PADialog::RenameDevice()
 {
-    String aPrinter( getSelectedDevice() );
+    OUString aPrinter( getSelectedDevice() );
     OUString aOldPrinter( aPrinter );
 
-    if( ! aPrinter.Len() )
+    if( aPrinter.isEmpty() )
         return;
 
-    String aTmpString( PaResId( RID_QRY_PRTNAME ) );
+    OUString aTmpString( PaResId( RID_QRY_PRTNAME ) );
     QueryString aQuery( this,
                         aTmpString,
                         aPrinter );
     aQuery.SetText( m_aRenameStr );
     aQuery.Execute();
 
-    if( aPrinter.Len() )
+    if( !aPrinter.isEmpty() )
     {
         PrinterInfo aInfo( m_rPIManager.getPrinterInfo( aOldPrinter ) );
         aInfo.m_aPrinterName = aPrinter;
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index bb058cb72473..031cab8abba1 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -60,8 +60,8 @@ namespace padmin {
         PushButton                          m_aAddPB;
         CancelButton                        m_aCancelButton;
 
-        String                              m_aDefPrt;
-        String                              m_aRenameStr;
+        OUString                            m_aDefPrt;
+        OUString                            m_aRenameStr;
 
         ::psp::PrinterInfoManager&          m_rPIManager;
         ::std::list< OUString >      m_aPrinters;
@@ -91,7 +91,7 @@ namespace padmin {
         virtual long Notify( NotifyEvent& rEv );
         virtual void DataChanged( const DataChangedEvent& rEv );
 
-        String getSelectedDevice();
+        OUString getSelectedDevice();
     public:
         ~PADialog();
 
diff --git a/padmin/source/progress.cxx b/padmin/source/progress.cxx
index a87a3d0c70a3..ec6e5c1d4f95 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.cxx
@@ -60,7 +60,7 @@ ProgressDialog::~ProgressDialog()
 {
 }
 
-void ProgressDialog::startOperation( const String& rOperation )
+void ProgressDialog::startOperation( const OUString& rOperation )
 {
     maOperation.SetText( rOperation );
     maProgressBar.SetValue( 0 );
@@ -75,7 +75,7 @@ void ProgressDialog::setValue( int nValue )
     Application::Reschedule();
 }
 
-void ProgressDialog::setFilename( const String& rFilename )
+void ProgressDialog::setFilename( const OUString& rFilename )
 {
     maFilename.SetText( rFilename );
     maFilename.Update();
diff --git a/padmin/source/progress.hxx b/padmin/source/progress.hxx
index a5f383b193b1..9b3db6c1d83f 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.hxx
@@ -46,8 +46,8 @@ namespace padmin {
 
         void setValue( int nValue );
         void setRange( int nMin, int nMax ) { mnMin = nMin; mnMax = nMax; }
-        void startOperation( const String& );
-        void setFilename( const String& );
+        void startOperation( const OUString& );
+        void setFilename( const OUString& );
 
         bool isCanceled() { return mbCanceled; }
     };
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 7e47ebcc694e..6c6f675bfeeb 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -39,7 +39,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
 
     const PPDValue* pValue = NULL;
     sal_uInt16 nPos = 0;
-    String aOptionText;
+    OUString aOptionText;
 
     for( int i = 0; i < pKey->countValues(); i++ )
     {
@@ -76,7 +76,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
  * RTSDialog
  */
 
-RTSDialog::RTSDialog( const PrinterInfo& rJobData, const String& rPrinter, bool bAllPages, Window* pParent )
+RTSDialog::RTSDialog( const PrinterInfo& rJobData, const OUString& rPrinter, bool bAllPages, Window* pParent )
     : TabDialog(pParent, "PrinterPropertiesDialog", "spa/ui/printerpropertiesdialog.ui" )
     , m_aJobData(rJobData)
     , m_aPrinter(rPrinter)
@@ -250,7 +250,7 @@ void RTSPaperPage::update()
 
     // duplex
     if( m_pParent->m_aJobData.m_pParser &&
-        (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "Duplex" ) )) )
+        (pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "Duplex" ) )) )
     {
         m_pParent->insertAllPPDValues( *m_pDuplexBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
@@ -262,7 +262,7 @@ void RTSPaperPage::update()
 
     // paper
     if( m_pParent->m_aJobData.m_pParser &&
-        (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "PageSize" ) )) )
+        (pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "PageSize" ) )) )
     {
         m_pParent->insertAllPPDValues( *m_pPaperBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
@@ -293,17 +293,17 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
     if( pBox == m_pPaperBox )
     {
         if( m_pParent->m_aJobData.m_pParser )
-            pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "PageSize" ) );
+            pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "PageSize" ) );
     }
     else if( pBox == m_pDuplexBox )
     {
         if( m_pParent->m_aJobData.m_pParser )
-            pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "Duplex" ) );
+            pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "Duplex" ) );
     }
     else if( pBox == m_pSlotBox )
     {
         if( m_pParent->m_aJobData.m_pParser )
-            pKey = m_pParent->m_aJobData.m_pParser->getKey( String( "InputSlot" ) );
+            pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString( "InputSlot" ) );
     }
     else if( pBox == m_pOrientBox )
     {
@@ -395,7 +395,7 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
                 ! pKey->getKey().equalsAscii( "Duplex" )
                 )
             {
-                String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
+                OUString aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
                 sal_uInt16 nPos = m_pPPDKeyBox->InsertEntry( aEntry );
                 m_pPPDKeyBox->SetEntryData( nPos, (void*)pKey );
             }
@@ -499,7 +499,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
         if( m_pParent->m_aJobData.m_aContext.checkConstraints( pKey, pValue ) &&
             m_pParent->m_aJobData.m_pParser )
         {
-            String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
+            OUString aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
             sal_uInt16 nPos = m_pPPDValueBox->InsertEntry( aEntry );
             m_pPPDValueBox->SetEntryData( nPos, (void*)pValue );
         }
@@ -789,8 +789,8 @@ RTSPWDialog::RTSPWDialog( const OString& rServer, const OString& rUserName, Wind
         m_aCancelButton( this, PaResId( RID_RTS_PWDIALOG_CANCEL_BTN ) )
 {
     FreeResource();
-    String aText( m_aText.GetText() );
-    aText.SearchAndReplace( String( "%s" ), OStringToOUString( rServer, osl_getThreadTextEncoding() ) );
+    OUString aText( m_aText.GetText() );
+    aText = aText.replaceFirst( "%s", OStringToOUString( rServer, osl_getThreadTextEncoding() ) );
     m_aText.SetText( aText );
     m_aUserEdit.SetText( OStringToOUString( rUserName, osl_getThreadTextEncoding() ) );
 }
@@ -825,9 +825,9 @@ extern "C" {
         return nRet;
     }
 
-    int SPA_DLLPUBLIC Sal_queryFaxNumber( String& rNumber )
+    int SPA_DLLPUBLIC Sal_queryFaxNumber( OUString& rNumber )
     {
-        String aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) );
+        OUString aTmpString( PaResId( RID_TXT_QUERYFAXNUMBER ) );
         QueryString aQuery( NULL, aTmpString, rNumber );
         return aQuery.Execute();
     }
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index efc217084c2c..7bb97d26e1ec 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.hxx
@@ -52,7 +52,7 @@ class RTSDialog : public TabDialog
     friend class RTSCommandPage;
 
     ::psp::PrinterInfo      m_aJobData;
-    String                  m_aPrinter;
+    OUString                m_aPrinter;
 
     // controls
     TabControl*             m_pTabControl;
@@ -75,7 +75,7 @@ class RTSDialog : public TabDialog
     // helper functions
     void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
 public:
-    RTSDialog( const ::psp::PrinterInfo& rJobData, const String& rPrinter, bool bAllPages, Window* pParent = NULL );
+    RTSDialog( const ::psp::PrinterInfo& rJobData, const OUString& rPrinter, bool bAllPages, Window* pParent = NULL );
     ~RTSDialog();
 
     const ::psp::PrinterInfo& getSetup() const { return m_aJobData; }
@@ -110,8 +110,8 @@ class RTSDevicePage : public TabPage
 {
     RTSDialog*          m_pParent;
 
-    String              m_aSpaceColor;
-    String              m_aSpaceGray;
+    OUString            m_aSpaceColor;
+    OUString            m_aSpaceGray;
 
     ListBox*            m_pPPDKeyBox;
     ListBox*            m_pPPDValueBox;
diff --git a/padmin/source/titlectrl.hxx b/padmin/source/titlectrl.hxx
index 8ed66cbe132b..a470ac2d4ebe 100644
--- a/padmin/source/titlectrl.hxx
+++ b/padmin/source/titlectrl.hxx
@@ -29,7 +29,7 @@ namespace padmin
 class TitleImage : public Control
 {
     Image               m_aImage;
-    String              m_aText;
+    OUString            m_aText;
     Color               m_aBGColor;
     Point               m_aImagePos;
     Point               m_aTextPos;