#96930# do not use gsl_getSystemTextEncoding anymore

5 files changed, 22 insertions, 19 deletions

diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 26ffeb5656e3..35e488de0819 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmddlg.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: pl $ $Date: 2002-06-19 09:50:28 $
+ *  last change: $Author: pl $ $Date: 2002-09-03 13:33:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,7 +119,7 @@ void CommandStore::getSystemPdfCommands( ::std::list< String >& rCommands )
         char pBuffer[1024];
         FILE* pPipe;
         String aCommand;
-        rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+        rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
         pPipe = popen( "which gs 2>/dev/null", "r" );
         if( pPipe )
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 1dd13a9e9dd5..2138d6fedb4c 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helper.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: pl $ $Date: 2002-09-03 13:23:11 $
+ *  last change: $Author: pl $ $Date: 2002-09-03 13:33:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -288,7 +288,7 @@ Config& padmin::getPadminRC()
     if( ! pRC )
     {
         static const char* pEnv = getenv( "HOME" );
-        String aFileName( pEnv ? pEnv : "", gsl_getSystemTextEncoding() );
+        String aFileName( pEnv ? pEnv : "", osl_getThreadTextEncoding() );
         aFileName.AppendAscii( "/.padminrc" );
         pRC = new Config( aFileName );
     }
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index abdf6716aa75..b613f7d04321 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: newppdlg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pl $ $Date: 2002-07-15 12:49:55 $
+ *  last change: $Author: pl $ $Date: 2002-09-03 13:33:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,7 +200,7 @@ void PPDImportDialog::Import()
         {
 #ifdef DEBUG
             fprintf( stderr, "Warning: File %s has empty printer name.\n",
-                     ByteString( ByteString( aPath.PathToFileName(), gsl_getSystemTextEncoding() ).GetBuffer() ) );
+                     ByteString( ByteString( aPath.PathToFileName(), osl_getThreadTextEncoding() ).GetBuffer() ) );
 #endif
             continue;
         }
@@ -212,7 +212,7 @@ void PPDImportDialog::Import()
 
 IMPL_LINK( PPDImportDialog, ClickBtnHdl, PushButton*, pButton )
 {
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
     if( pButton == &m_aCancelBtn )
     {
@@ -277,7 +277,7 @@ IMPL_LINK( PPDImportDialog, ModifyHdl, ComboBox*, pListBox )
 {
     if( pListBox == &m_aPathBox )
     {
-        ByteString aDir( m_aPathBox.GetText(), gsl_getSystemTextEncoding() );
+        ByteString aDir( m_aPathBox.GetText(), osl_getThreadTextEncoding() );
         if( ! access( aDir.GetBuffer(), F_OK ) )
             Import();
     }
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 5021cf83eeb9..6c14a649bddb 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: padialog.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: hr $ $Date: 2001-10-23 17:47:26 $
+ *  last change: $Author: pl $ $Date: 2002-09-03 13:33:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -363,7 +363,7 @@ void PADialog::PrintTestPage()
     if( m_pPrinter ) // already printing; user pressed button twice
         return;
 
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
     String sPrinter( getSelectedDevice() );
 
@@ -617,7 +617,7 @@ void PADialog::ConfigureDevice()
 
 void PADialog::RenameDevice()
 {
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
     String aPrinter( getSelectedDevice() );
     OUString aOldPrinter( aPrinter );
@@ -656,7 +656,7 @@ void PADialog::RenameDevice()
 
 void PADialog::UpdateDevice()
 {
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
     m_aDevicesLB.Clear();
 
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 6f9c1979ee05..5d571a38b609 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: prtsetup.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: pl $ $Date: 2001-12-06 19:47:09 $
+ *  last change: $Author: pl $ $Date: 2002-09-03 13:33:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,6 +74,9 @@
 #ifndef _PAD_COMMANDDLG_HXX_
 #include <cmddlg.hxx>
 #endif
+#ifndef _OSL_THREAD_H_
+#include <osl/thread.h>
+#endif
 
 #define LSCAPE_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Landscape" ) )
 #define PORTRAIT_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Portrait" ) )
@@ -145,7 +148,7 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const String& rPrinter, bool
         m_pCommandPage( NULL )
 {
     FreeResource();
-    rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
+    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
 
     String aTitle( GetText() );
     aTitle.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%s" ) ), m_aJobData.m_aPrinterName );