diff options
-rw-r--r-- | automation/source/testtool/comm_bas.hxx | 4 | ||||
-rw-r--r-- | automation/source/testtool/objtest.cxx | 2 | ||||
-rw-r--r-- | extensions/source/plugin/unx/makefile.mk | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/automation/source/testtool/comm_bas.hxx b/automation/source/testtool/comm_bas.hxx index 3587efcc4806..0754e0e23667 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ür Manager und Links // 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 7dc7ae374f0a..25992c20a7aa 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -425,8 +425,6 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die d 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 f642a0d4c779..7ed18c291a4c 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" |