[Libreoffice-commits] .: vcl/aqua

[Stephan Bergmann]

 vcl/aqua/source/app/salinst.cxx |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d43f1e85aa768656a30cae9cbc131b072597250f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Dec 14 17:58:39 2011 +0100

    Adapted Mac-only code to ByteString reduction.

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0898e67..3df6844 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -325,7 +325,7 @@ void InitSalMain()
             if ( aCmdPath.Len() ) {
                 DirEntry aCmdDirEntry( aCmdPath );
                 aCmdDirEntry.ToAbs();
-                aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
+                aCmdPath = rtl::OUStringToOString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
             }
             // Assign to PATH environment variable
             if ( aCmdPath.Len() )
@@ -333,7 +333,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "PATH=" );
                 aTmpPath += aCmdPath;
                 if ( aPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -343,7 +343,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "STAR_RESOURCEPATH=" );
                 aTmpPath += aCmdPath;
                 if ( aResPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aResPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }
@@ -353,7 +353,7 @@ void InitSalMain()
                 aTmpPath = ByteString( "DYLD_LIBRARY_PATH=" );
                 aTmpPath += aCmdPath;
                 if ( aLibPath.Len() )
-                    aTmpPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
+                    aTmpPath += rtl::OUStringToOString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
                 aTmpPath += aLibPath;
                 putenv( (char*)aTmpPath.GetBuffer() );
             }