convert archaic String types to rtl

4 files changed, 15 insertions, 15 deletions

diff --git a/vcl/unx/inc/sm.hxx b/vcl/unx/inc/sm.hxx
index 158c320948bc..b13d25cc5cc8 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/unx/inc/sm.hxx
@@ -69,7 +69,7 @@ public:
     static void saveDone();
     static void interactionDone( bool bCancelShutdown );
 
-    static String getExecName();
+    static rtl::OUString getExecName();
     static VCL_DLLPUBLIC const ByteString&  getSessionID();
 };
 
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index cf38f4bb5c1a..c85c44cb2b61 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -735,10 +735,10 @@ void SalDisplay::initScreen( int nScreen ) const
                          1
                          );
 
-        ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
+        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
         const char* argv[2];
         argv[0] = "/bin/sh";
-        argv[1] = aExec.GetBuffer();
+        argv[1] = aExec.getStr();
         XSetCommand( pDisp_, rSD.m_aRefWindow, const_cast<char**>(argv), 2 );
         XSelectInput( pDisp_, rSD.m_aRefWindow, PropertyChangeMask );
 
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index e7eeaa3cd5ee..126d7090801d 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.cxx
@@ -211,7 +211,7 @@ static void BuildSmPropertyList()
 {
     if( ! pSmProps )
     {
-        ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
+        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
 
         nSmProps = 5;
         pSmProps = new SmProp[ nSmProps ];
@@ -220,22 +220,22 @@ static void BuildSmPropertyList()
         pSmProps[ 0 ].type      = const_cast<char*>(SmLISTofARRAY8);
         pSmProps[ 0 ].num_vals  = 1;
         pSmProps[ 0 ].vals      = new SmPropValue;
-        pSmProps[ 0 ].vals->length  = aExec.Len()+1;
-        pSmProps[ 0 ].vals->value   = strdup( aExec.GetBuffer() );
+        pSmProps[ 0 ].vals->length  = aExec.getLength()+1;
+        pSmProps[ 0 ].vals->value   = strdup( aExec.getStr() );
 
         pSmProps[ 1 ].name      = const_cast<char*>(SmProgram);
         pSmProps[ 1 ].type      = const_cast<char*>(SmARRAY8);
         pSmProps[ 1 ].num_vals  = 1;
         pSmProps[ 1 ].vals      = new SmPropValue;
-        pSmProps[ 1 ].vals->length  = aExec.Len()+1;
-        pSmProps[ 1 ].vals->value   = strdup( aExec.GetBuffer() );
+        pSmProps[ 1 ].vals->length  = aExec.getLength()+1;
+        pSmProps[ 1 ].vals->value   = strdup( aExec.getStr() );
 
         pSmProps[ 2 ].name      = const_cast<char*>(SmRestartCommand);
         pSmProps[ 2 ].type      = const_cast<char*>(SmLISTofARRAY8);
         pSmProps[ 2 ].num_vals  = 3;
         pSmProps[ 2 ].vals      = new SmPropValue[3];
-        pSmProps[ 2 ].vals[0].length    = aExec.Len()+1;
-        pSmProps[ 2 ].vals[0].value = strdup( aExec.GetBuffer() );
+        pSmProps[ 2 ].vals[0].length    = aExec.getLength()+1;
+        pSmProps[ 2 ].vals[0].value = strdup( aExec.getStr() );
             ByteString aRestartOption( "-session=" );
         aRestartOption.Append( SessionManagerClient::getSessionID() );
         pSmProps[ 2 ].vals[1].length    = aRestartOption.Len()+1;
@@ -559,7 +559,7 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown )
 }
 
 
-String SessionManagerClient::getExecName()
+rtl::OUString SessionManagerClient::getExecName()
 {
     rtl::OUString aExec, aSysExec;
     osl_getExecutableFile( &aExec.pData );
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 0324f24e03a4..e751c04218c6 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.cxx
@@ -3996,10 +3996,10 @@ long X11SalFrame::HandleClientMessage( XClientMessageEvent *pEvent )
                 {
                     if( this == s_pSaveYourselfFrame )
                     {
-                        ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
+                        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
                         const char* argv[2];
                         argv[0] = "/bin/sh";
-                        argv[1] = const_cast<char*>(aExec.GetBuffer());
+                        argv[1] = const_cast<char*>(aExec.getStr());
     #if OSL_DEBUG_LEVEL > 1
                         fprintf( stderr, "SaveYourself request, setting command: %s %s\n", argv[0], argv[1] );
     #endif
@@ -4044,10 +4044,10 @@ void X11SalFrame::SaveYourselfDone( SalFrame* pSaveFrame )
     // session save was done, inform dtwm
     if( s_pSaveYourselfFrame && pSaveFrame )
     {
-        ByteString aExec( SessionManagerClient::getExecName(), osl_getThreadTextEncoding() );
+        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
         const char* argv[2];
         argv[0] = "/bin/sh";
-        argv[1] = const_cast<char*>(aExec.GetBuffer());
+        argv[1] = const_cast<char*>(aExec.getStr());
 #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "SaveYourself request, setting command: %s %s\n", argv[0], argv[1] );
 #endif