rebase to dev300 m69.

7 files changed, 1 insertions, 33 deletions

diff --git a/autodoc/source/parser/cpp/c_rcode.cxx b/autodoc/source/parser/cpp/c_rcode.cxx
index e8f688168d3f..dd62dbbae2e5 100644
--- a/autodoc/source/parser/cpp/c_rcode.cxx
+++ b/autodoc/source/parser/cpp/c_rcode.cxx
@@ -42,27 +42,6 @@
 #include <x_parse.hxx>
 #include "pe_file.hxx"
 
-#ifdef IRIX
-// see i19418 incomplete type for cpp::PE_Namespace
-#include "pe_namsp.hxx"
-#include "pe_ignor.hxx"
-#include "pe_defs.hxx"
-#include "pe_vafu.hxx"
-#include "pe_tydef.hxx"
-#include "pe_tpltp.hxx"
-#include "pe_type.hxx"
-#include "pe_vari.hxx"
-#include "pe_funct.hxx"
-#include "pe_enum.hxx"
-#include "pe_param.hxx"
-#include "pe_class.hxx"
-#include "pe_expression.hxx"
-#include "pe_base.hxx"
-#include "pe_enum.hxx"
-#include "pe_enval.hxx"
-#endif
-
-
 const uintt C_nNO_TRY = uintt(-1);
 
 
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
index b942f530141e..dd0b0cfcfd10 100755
--- a/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/build.xml
@@ -25,7 +25,6 @@
     <path id="scriptclasspath">
       <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/sandbox.jar"/>
       <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
diff --git a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
index e5d4a5664eed..572e7c4c459a 100755
--- a/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
+++ b/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml
@@ -25,7 +25,6 @@
     <path id="scriptclasspath">
       <pathelement location="${opp}/classes/unoil.jar"/>
       <pathelement location="${opp}/classes/ridl.jar"/>
-      <pathelement location="${opp}/classes/sandbox.jar"/>
       <pathelement location="${opp}/classes/jurt.jar"/>
       <pathelement location="${opp}/classes/juh.jar"/>
       <pathelement location="${opp}/classes/ScriptFramework.jar"/>
diff --git a/odk/pack/gendocu/makefile.mk b/odk/pack/gendocu/makefile.mk
index 5b070ca043f6..1970acebda7a 100644
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@ -52,7 +52,6 @@ JAVA_PACKAGES=\
         com.sun.star.comp.helper \
         com.sun.star.lib.uno.helper \
         com.sun.star.lib.unoloader \
-        com.sun.star.tools.uno \
         com.sun.star.uno \
         $(JAVA_SRC_DIR)$/com$/sun$/star$/lib$/util$/UrlToFileMapper.java
 #        com.sun.star.beans \
diff --git a/odk/prj/build.lst b/odk/prj/build.lst
index fbdaab8486bd..bbb8262780cf 100644
--- a/odk/prj/build.lst
+++ b/odk/prj/build.lst
@@ -1,4 +1,4 @@
-od	odk	::	cppuhelper cpputools io jurt javaunohelper sandbox remotebridges stoc udkapi ridljar offapi unoil autodoc unodevtools external cli_ure NULL
+od      odk     ::      cppuhelper jurt javaunohelper udkapi ridljar offapi autodoc unodevtools external NULL
 od	odk					usr1	-	all	od_mkout NULL
 od	odk\inc				nmake	-	all	od_inc NULL
 od	odk\source\com\sun\star\lib\loader	nmake	-	all	od_loader od_inc NULL
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index 7c826ddb265c..2990c3b8d092 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -55,8 +55,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/bsd
 JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
 .ELIF "$(OS)" == "NETBSD"
 JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd
-.ELIF "$(OS)" == "IRIX"
-JAVA_INCLUDES+= -I$(JAVA_HOME)/include/solaris
 .ENDIF
 .ENDIF
 
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 57604f81b05c..33ff68c90ab1 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -162,12 +162,6 @@ DESTPLATFROM=netbsd
 ###########
 DESTPLATFROM=freebsd
 
-.ELIF "$(OS)"=="IRIX"
-###########
-# IRIX
-###########
-DESTPLATFROM=irix
-
 .ELIF "$(OS)"=="MACOSX"
 ###########
 # MACOSX