[Libreoffice-commits] .: 2 commits - automation/source extensions/source

[Thomas Arnhold]

 automation/source/testtool/comm_bas.hxx  |    4 ++--
 automation/source/testtool/objtest.cxx   |    4 ----
 extensions/source/plugin/unx/makefile.mk |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit ae8037bdc2911c14ebb9067ce55e16d2ec9bf13c
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 13:25:57 2011 +0100

    Remove SCO support

diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index d1851be..da97d47 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -417,8 +417,6 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     abGP.Append( "502" );  // Windows on x64
 #elif defined SOLARIS && defined SPARC
     abGP.Append( "01" );  // Solaris SPARC
-#elif defined SCO
-    abGP.Append( "02" );  // SCO UNIX
 #elif defined LINUX && defined INTEL
     abGP.Append( "03" );  // Linux
 #elif defined AIX
commit 137c43ccca589eede95428e08c568755d39d3c80
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Wed Feb 16 12:52:49 2011 +0100

    Remove HPUX support

diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx
index ce99432..2ba960b 100644
--- a/automation/source/testtool/comm_bas.hxx
+++ b/automation/source/testtool/comm_bas.hxx
@@ -41,12 +41,12 @@ class CommunicationWrapper : public SbxObject	// Einer f
     // Definition eines Tabelleneintrags. Dies wird hier gemacht,
     // da dadurch die Methoden und Properties als private deklariert
     // werden koennen.
-#if defined ( ICC ) || defined ( HPUX ) || defined ( C50 ) || defined ( C52 )
+#if defined ( ICC ) || defined ( C50 ) || defined ( C52 )
 public:
 #endif
     typedef void( CommunicationWrapper::*pMeth )
         ( SbxVariable* pThis, SbxArray* pArgs, BOOL bWrite );
-#if defined ( ICC ) || defined ( HPUX )
+#if defined ( ICC )
 private:
 #endif
 
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 5c10f77..d1851be 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -425,8 +425,6 @@ void TestToolObj::LoadIniFile()				// Laden der IniEinstellungen, die durch den
     abGP.Append( "04" );
 #elif defined SOLARIS && defined INTEL
     abGP.Append( "05" );  // Solaris x86
-#elif defined HPUX
-    abGP.Append( "07" );
 #elif defined FREEBSD
     abGP.Append( "08" );
 #elif defined MACOSX
diff --git a/extensions/source/plugin/unx/makefile.mk b/extensions/source/plugin/unx/makefile.mk
index f642a0d..7ed18c2 100644
--- a/extensions/source/plugin/unx/makefile.mk
+++ b/extensions/source/plugin/unx/makefile.mk
@@ -71,7 +71,7 @@ APP1TARGET=pluginapp.bin
 APP1OBJS=$(OBJFILES)
 APP1STDLIBS= $(SALLIB)
 
-.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO" || "$(OS)"=="HPUX"
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="SCO"
 APP1STDLIBS+=-lXm -lXt $(X11LINK_DYNAMIC) -ldl
 .ELSE
 .IF "$(DISABLE_XAW)" != "TRUE"