5 files changed, 64 insertions, 40 deletions

diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index 33fa59095e15..95662f9f5d00 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -133,11 +133,6 @@ pre-fetch:
 	@${ECHO} "You can compile OOo with evolution2 support by"
 	@${ECHO} "make -DWITH_EVOLUTION2"
 .endif
-.if !defined(WITH_MENU)
-	@${ECHO}
-	@${ECHO} "You can install OOo with menu items by"
-	@${ECHO} "make -DWITH_MENU"
-.endif
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
diff --git a/editors/openoffice.org-2-devel/files/patch-i65514 b/editors/openoffice.org-2-devel/files/patch-i65514
index 8589161a0290..d0cf3aafbd19 100644
--- a/editors/openoffice.org-2-devel/files/patch-i65514
+++ b/editors/openoffice.org-2-devel/files/patch-i65514
@@ -1,14 +1,15 @@
 Index: berkeleydb/db-4.2.52.patch
 ===================================================================
 RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
-retrieving revision 1.13
-diff -u -r1.13 db-4.2.52.patch
---- berkeleydb/db-4.2.52.patch	25 Jul 2006 10:23:22 -0000	1.13
-+++ berkeleydb/db-4.2.52.patch	29 Jul 2006 11:01:12 -0000
-@@ -518,6 +518,20 @@
-   emode=	555
-   fmode=	444
-   
+retrieving revision 1.15
+diff -u -r1.15 db-4.2.52.patch
+--- berkeleydb/db-4.2.52.patch	22 Nov 2006 10:35:13 -0000	1.15
++++ berkeleydb/db-4.2.52.patch	6 Dec 2006 00:28:05 -0000
+@@ -205,6 +205,21 @@
+ !         $(SLO)$/dbreg_util.obj
+ ! 
+ ! .INCLUDE :  target.mk
++
 +*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
 +--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
 +***************
@@ -23,13 +24,13 @@ diff -u -r1.13 db-4.2.52.patch
 +  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 +  #undef HAVE_NDIR_H
 +  
- *** misc/db-4.2.52.NC/dist/configure	Wed Dec  3 22:10:02 2003
- --- misc/build/db-4.2.52.NC/dist/configure	Tue Jul 25 09:05:20 2006
+ *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
+ --- misc/build/db-4.2.52.NC/dist/configure	2006-05-02 17:06:13.000000000 +0200
  ***************
-@@ -554,6 +568,76 @@
-     fi
-   
-     # Commands to make compiler produce verbose output that lists
+@@ -273,6 +288,77 @@
+   	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+   	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+   	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 +***************
 +*** 28556,28561 ****
 +--- 28556,28606 ----
@@ -100,10 +101,11 @@ diff -u -r1.13 db-4.2.52.patch
 +  _ACEOF
 +  
 +  
- *** misc/db-4.2.52.NC/dist/ltmain.sh	Sat Apr 26 19:45:37 2003
- --- misc/build/db-4.2.52.NC/dist/ltmain.sh	Tue Jul 25 09:05:20 2006
++
+ *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
+ --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2006-05-02 16:55:53.000000000 +0200
  ***************
-@@ -1010,3 +1094,39 @@
+@@ -975,3 +1061,39 @@
  ! 			$(SLO)$/xa_map.obj
  ! 
  ! .INCLUDE :  target.mk
diff --git a/editors/openoffice.org-2-devel/files/patch-i66666 b/editors/openoffice.org-2-devel/files/patch-i66666
deleted file mode 100644
index 11b05eaf0815..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i66666
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: tools/inc/solar.h
-===================================================================
-RCS file: /cvs/util/tools/inc/solar.h,v
-retrieving revision 1.44
-diff -u -r1.44 solar.h
---- tools/inc/solar.h	26 Apr 2006 20:42:59 -0000	1.44
-+++ tools/inc/solar.h	23 Jun 2006 13:32:04 -0000
-@@ -55,9 +55,6 @@
- #define FALSE		0
- #endif
- 
--#undef NULL
--#define NULL		0
--
- #ifdef _SOLAR__PRIVATE
- #undef _SOLAR__PRIVATE
- #endif
-
diff --git a/editors/openoffice.org-2-devel/files/patch-i71848 b/editors/openoffice.org-2-devel/files/patch-i71848
new file mode 100644
index 000000000000..053048ec6f71
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i71848
@@ -0,0 +1,30 @@
+--- svx/source/msfilter/msdffimp.cxx	2006-11-22
+11:22:41.000000000 +0100
++++ svx/source/msfilter/msdffimp.cxx	2006-11-22
+11:52:34.000000000 +0100
+@@ -3516,7 +3516,7 @@
+ 		Scale( rPoly[ nPolyNum ] );
+ }
+ 
+-void SvxMSDffManager::ScaleEmu( long& rVal ) const
++void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
+ {
+ 	rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv );
+ }
+
+
+--- svx/source/svdraw/svdtxhdl.cxx	2006-11-22
+11:22:43.000000000 +0100
++++ svx/source/svdraw/svdtxhdl.cxx	2006-11-22
+11:53:00.000000000 +0100
+@@ -183,7 +183,7 @@
+ 		rOutliner.Clear();
+ 		rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
+ 		rOutliner.SetText(*pPara);
+-		sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), rOutliner.GetParagraphCount()));
++		sal_uInt32 nCnt(Min(aContourPolyPolygon.count(), (sal_uInt32)rOutliner.GetParagraphCount()));
+ 
+ 		if ( nCnt == 1 )    bToLastPoint = TRUE;
+ 		else                bToLastPoint = FALSE;
+
+
diff --git a/editors/openoffice.org-2-devel/files/patch-i71977 b/editors/openoffice.org-2-devel/files/patch-i71977
new file mode 100644
index 000000000000..3feddab4bcd8
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i71977
@@ -0,0 +1,15 @@
+Index: sd/inc/CustomAnimationPreset.hxx
+===================================================================
+RCS file: /cvs/graphics/sd/inc/CustomAnimationPreset.hxx,v
+retrieving revision 1.3
+diff -u -r1.3 CustomAnimationPreset.hxx
+--- sd/inc/CustomAnimationPreset.hxx	9 Sep 2005 02:50:54 -0000	1.3
++++ sd/inc/CustomAnimationPreset.hxx	5 Dec 2006 08:01:01 -0000
+@@ -56,6 +56,7 @@
+ #include <CustomAnimationEffect.hxx>
+ #endif
+ 
++#include <hash_map>
+ 
+ namespace sd {
+