[Libreoffice-commits] .: 2 commits - padmin/source vcl/inc vcl/unx

[Thomas Arnhold]

 padmin/source/spadmin.sh        |    2 --
 vcl/inc/unx/saldata.hxx         |    1 -
 vcl/unx/generic/app/saldata.cxx |    2 --
 vcl/unx/generic/app/saldisp.cxx |    4 ----
 4 files changed, 9 deletions(-)

New commits:
commit ea2a64df68f8896f894438ed0dd3dde057af8af1
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jul 22 02:02:36 2011 +0200

    Remove unused env XENVIRONMENT

diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index b8fec87..81978a7 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -86,8 +86,6 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
     fi
 fi
 
-unset XENVIRONMENT
-
 # uncomment line below to disable anti aliasing of fonts
 # SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE
 
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index c65d8f0..692d8f6 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2537,8 +2537,6 @@ void SalDisplay::PrintInfo() const
     {
         fprintf( stderr, "\n" );
         fprintf( stderr, "Environment\n" );
-        fprintf( stderr, "\t$XENVIRONMENT     \t\"%s\"\n",
-                 GetEnv( "XENVIRONMENT" ) );
         fprintf( stderr, "\t$DISPLAY          \t\"%s\"\n",
                  GetEnv( "DISPLAY" ) );
         fprintf( stderr, "\t$SAL_VISUAL       \t\"%s\"\n",
commit 2ade94e29a05ade209c69376275e1c2293339859
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jul 22 01:56:29 2011 +0200

    Remove SAL_NOSEGV
    
    This is deprecated an non-functional.
    
    See: http://wiki.services.openoffice.org/wiki/Environment_Variables

diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 9288eee..d466c00 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -57,7 +57,6 @@ typedef	unsigned int pthread_t;
 class VCLPLUG_GEN_PUBLIC X11SalData : public SalData
 {
 protected:
-            sal_Bool				bNoExceptions_;
             SalXLib			   *pXLib_;
             SalDisplay		   *m_pSalDisplay;
             pthread_t			hMainThread_;
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index a68f983..6554952 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -266,8 +266,6 @@ int X11SalData::XIOErrorHdl( Display * )
 
 X11SalData::X11SalData()
 {
-    bNoExceptions_	= !!getenv( "SAL_NOSEGV" );
-
     pXLib_			= NULL;
     m_pSalDisplay	= NULL;
     m_pInstance		= NULL;
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 4980504..c65d8f0 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2543,8 +2543,6 @@ void SalDisplay::PrintInfo() const
                  GetEnv( "DISPLAY" ) );
         fprintf( stderr, "\t$SAL_VISUAL       \t\"%s\"\n",
                  GetEnv( "SAL_VISUAL" ) );
-        fprintf( stderr, "\t$SAL_NOSEGV       \t\"%s\"\n",
-                 GetEnv( "SAL_NOSEGV" ) );
         fprintf( stderr, "\t$SAL_IGNOREXERRORS\t\"%s\"\n",
                  GetEnv( "SAL_IGNOREXERRORS" ) );
         fprintf( stderr, "\t$SAL_PROPERTIES   \t\"%s\"\n",