* Update to SRC680_m214.

* Build fix with gcc42 (patch-i78032) [1].

Submitted by:	jkim [1]

20 files changed, 84 insertions, 244 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 7263abc67477..bb179f369ef2 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		213
+MILESTONE?=		214
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070525
+SNAPDATE=		20070601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index b95fc19e9a46..8cf4905f1ea7 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 7120d049a1aa1801205d574abd1c77fd
-SHA256 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 1f8edbecfa3e9c2122c2f3a0acbcd4c52620a86e5b1c06d93b04cce34b49ca7d
-SIZE (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 270389079
+MD5 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = c7c709584daf02f4e9adf2a976e49b67
+SHA256 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 1bb03531e034bf11eb9ea759e040e5263e57d7bfcd3fc71401de82e7a0efc0b5
+SIZE (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 270455564
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3-devel/files/patch-i77793 b/editors/openoffice-3-devel/files/patch-i77793
deleted file mode 100644
index e182b8727409..000000000000
--- a/editors/openoffice-3-devel/files/patch-i77793
+++ /dev/null
@@ -1,11 +0,0 @@
---- sw/source/core/unocore/unotbl.cxx	2007-05-25 13:02:05.000000000 +0200
-+++ sw/source/core/unocore/unotbl.cxx	2007-05-25 13:09:00.000000000 +0200
-@@ -4455,7 +4455,7 @@
-                             // now we'll try to get a useful numerical value
-                             // from the text in the cell...
- 
--                            ULONG nFIndex;
-+                            sal_uInt32 nFIndex;
-                             SvNumberFormatter* pNumFormatter = pTblCrsr->GetDoc()->GetNumberFormatter();
- 
-                             // look for SwTblBoxNumFormat value in parents as well
diff --git a/editors/openoffice-3-devel/files/patch-i77829 b/editors/openoffice-3-devel/files/patch-i77829
deleted file mode 100644
index c7be6ab14215..000000000000
--- a/editors/openoffice-3-devel/files/patch-i77829
+++ /dev/null
@@ -1,45 +0,0 @@
-g++42  -fmessage-length=0 -c -Os -fno-strict-aliasing   -ftemplate-depth-128 -I.  -I../../../unxfbsdi.pro/inc/chcdialogs -I../inc -I../../../source/inc -I../../../inc/pch -I../../../inc/chart2 -I../../../inc -I../../../unx/inc -I../../../unxfbsdi.pro/inc -I. -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/external -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/unxfbsdi/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/res -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc/Xp31 -I/usr/local/diablo-jdk1.5.0/include -I/usr/local/diablo-jdk1.5.0/include/freebsd -I/usr/local/diablo-jdk1.5.0/include/bsd -I/usr/local/diablo-jdk1.5.0/include/linux -I/usr/local/diablo-jdk1.5.0/include/native_threads/include -I/usr/local/include     -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/offuh -I. -I../../../res -I. -pipe -mtune=pentiumpro -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DINTEL -DCVER=C341 -DX86  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc-4.2.0/include/c++ -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DCUI -DSOLAR_JAVA -DSRC680=SRC680   -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../../unxfbsdi.pro/slo/DataBrowser.o /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx 
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/cppuhelper/implbase1.hxx:42,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/transfer.hxx:54,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/brwbox.hxx:56,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/editbrowsebox.hxx:69,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.hxx:40,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:51:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:305: warning: empty body in an else-statement
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor, DataCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:329: warning: empty body in an else-statement
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:52:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx: At global scope:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx:110: error: extra qualification 'chart::DataBrowserModel::' on member 'setCellAny'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'bool chart::DataBrowser::MaySwapColumns() const':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:574: warning: declaration of 'bHasFocus' shadows a member of 'this'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'void chart::DataBrowser::RenewTable()':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:634: warning: declaration of 'nRowCount' shadows a member of 'this'
-dmake:  Error code 1, while making '../../../unxfbsdi.pro/slo/DataBrowser.obj'
----* tg_merge.mk *---
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs
-dmake:  Error code 1, while making 'build_instsetoo_native'
----*  *---
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2-devel.
-
-Index: chart2/source/controller/dialogs/DataBrowserModel.hxx
-===================================================================
-RCS file: /cvs/graphics/chart2/source/controller/dialogs/DataBrowserModel.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 DataBrowserModel.hxx
---- chart2/source/controller/dialogs/DataBrowserModel.hxx	22 May 2007 17:27:59 -0000	1.2
-+++ chart2/source/controller/dialogs/DataBrowserModel.hxx	26 May 2007 10:47:37 -0000
-@@ -106,8 +106,7 @@
-     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
-     /// returns </TRUE> if the text could successfully be set at the given position
-     bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
--    bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow,
--                                       const ::com::sun::star::uno::Any & aValue );
-+    bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
- 
-     sal_Int32 getColumnCount() const;
-     sal_Int32 getMaxRowCount() const;
diff --git a/editors/openoffice-3-devel/files/patch-i78032 b/editors/openoffice-3-devel/files/patch-i78032
new file mode 100644
index 000000000000..e2b523c56e85
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-i78032
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.19
+diff -u -r1.19 makefile.mk
+--- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
++++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
+@@ -79,7 +79,7 @@
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELSE
+-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELIF "$(OS)"=="MACOSX"
+ .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 7263abc67477..bb179f369ef2 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		213
+MILESTONE?=		214
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070525
+SNAPDATE=		20070601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index b95fc19e9a46..8cf4905f1ea7 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 7120d049a1aa1801205d574abd1c77fd
-SHA256 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 1f8edbecfa3e9c2122c2f3a0acbcd4c52620a86e5b1c06d93b04cce34b49ca7d
-SIZE (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 270389079
+MD5 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = c7c709584daf02f4e9adf2a976e49b67
+SHA256 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 1bb03531e034bf11eb9ea759e040e5263e57d7bfcd3fc71401de82e7a0efc0b5
+SIZE (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 270455564
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-devel/files/patch-i77793 b/editors/openoffice.org-2-devel/files/patch-i77793
deleted file mode 100644
index e182b8727409..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i77793
+++ /dev/null
@@ -1,11 +0,0 @@
---- sw/source/core/unocore/unotbl.cxx	2007-05-25 13:02:05.000000000 +0200
-+++ sw/source/core/unocore/unotbl.cxx	2007-05-25 13:09:00.000000000 +0200
-@@ -4455,7 +4455,7 @@
-                             // now we'll try to get a useful numerical value
-                             // from the text in the cell...
- 
--                            ULONG nFIndex;
-+                            sal_uInt32 nFIndex;
-                             SvNumberFormatter* pNumFormatter = pTblCrsr->GetDoc()->GetNumberFormatter();
- 
-                             // look for SwTblBoxNumFormat value in parents as well
diff --git a/editors/openoffice.org-2-devel/files/patch-i77829 b/editors/openoffice.org-2-devel/files/patch-i77829
deleted file mode 100644
index c7be6ab14215..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i77829
+++ /dev/null
@@ -1,45 +0,0 @@
-g++42  -fmessage-length=0 -c -Os -fno-strict-aliasing   -ftemplate-depth-128 -I.  -I../../../unxfbsdi.pro/inc/chcdialogs -I../inc -I../../../source/inc -I../../../inc/pch -I../../../inc/chart2 -I../../../inc -I../../../unx/inc -I../../../unxfbsdi.pro/inc -I. -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/external -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/unxfbsdi/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/res -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc/Xp31 -I/usr/local/diablo-jdk1.5.0/include -I/usr/local/diablo-jdk1.5.0/include/freebsd -I/usr/local/diablo-jdk1.5.0/include/bsd -I/usr/local/diablo-jdk1.5.0/include/linux -I/usr/local/diablo-jdk1.5.0/include/native_threads/include -I/usr/local/include     -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/offuh -I. -I../../../res -I. -pipe -mtune=pentiumpro -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DINTEL -DCVER=C341 -DX86  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc-4.2.0/include/c++ -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DCUI -DSOLAR_JAVA -DSRC680=SRC680   -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../../unxfbsdi.pro/slo/DataBrowser.o /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx 
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/cppuhelper/implbase1.hxx:42,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/transfer.hxx:54,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/brwbox.hxx:56,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/editbrowsebox.hxx:69,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.hxx:40,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:51:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:305: warning: empty body in an else-statement
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor, DataCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:329: warning: empty body in an else-statement
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:52:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx: At global scope:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx:110: error: extra qualification 'chart::DataBrowserModel::' on member 'setCellAny'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'bool chart::DataBrowser::MaySwapColumns() const':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:574: warning: declaration of 'bHasFocus' shadows a member of 'this'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'void chart::DataBrowser::RenewTable()':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:634: warning: declaration of 'nRowCount' shadows a member of 'this'
-dmake:  Error code 1, while making '../../../unxfbsdi.pro/slo/DataBrowser.obj'
----* tg_merge.mk *---
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs
-dmake:  Error code 1, while making 'build_instsetoo_native'
----*  *---
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2-devel.
-
-Index: chart2/source/controller/dialogs/DataBrowserModel.hxx
-===================================================================
-RCS file: /cvs/graphics/chart2/source/controller/dialogs/DataBrowserModel.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 DataBrowserModel.hxx
---- chart2/source/controller/dialogs/DataBrowserModel.hxx	22 May 2007 17:27:59 -0000	1.2
-+++ chart2/source/controller/dialogs/DataBrowserModel.hxx	26 May 2007 10:47:37 -0000
-@@ -106,8 +106,7 @@
-     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
-     /// returns </TRUE> if the text could successfully be set at the given position
-     bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
--    bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow,
--                                       const ::com::sun::star::uno::Any & aValue );
-+    bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
- 
-     sal_Int32 getColumnCount() const;
-     sal_Int32 getMaxRowCount() const;
diff --git a/editors/openoffice.org-2-devel/files/patch-i78032 b/editors/openoffice.org-2-devel/files/patch-i78032
new file mode 100644
index 000000000000..e2b523c56e85
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-i78032
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.19
+diff -u -r1.19 makefile.mk
+--- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
++++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
+@@ -79,7 +79,7 @@
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELSE
+-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELIF "$(OS)"=="MACOSX"
+ .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 7263abc67477..bb179f369ef2 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		213
+MILESTONE?=		214
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070525
+SNAPDATE=		20070601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index b95fc19e9a46..8cf4905f1ea7 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 7120d049a1aa1801205d574abd1c77fd
-SHA256 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 1f8edbecfa3e9c2122c2f3a0acbcd4c52620a86e5b1c06d93b04cce34b49ca7d
-SIZE (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 270389079
+MD5 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = c7c709584daf02f4e9adf2a976e49b67
+SHA256 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 1bb03531e034bf11eb9ea759e040e5263e57d7bfcd3fc71401de82e7a0efc0b5
+SIZE (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 270455564
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3-devel/files/patch-i77793 b/editors/openoffice.org-3-devel/files/patch-i77793
deleted file mode 100644
index e182b8727409..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i77793
+++ /dev/null
@@ -1,11 +0,0 @@
---- sw/source/core/unocore/unotbl.cxx	2007-05-25 13:02:05.000000000 +0200
-+++ sw/source/core/unocore/unotbl.cxx	2007-05-25 13:09:00.000000000 +0200
-@@ -4455,7 +4455,7 @@
-                             // now we'll try to get a useful numerical value
-                             // from the text in the cell...
- 
--                            ULONG nFIndex;
-+                            sal_uInt32 nFIndex;
-                             SvNumberFormatter* pNumFormatter = pTblCrsr->GetDoc()->GetNumberFormatter();
- 
-                             // look for SwTblBoxNumFormat value in parents as well
diff --git a/editors/openoffice.org-3-devel/files/patch-i77829 b/editors/openoffice.org-3-devel/files/patch-i77829
deleted file mode 100644
index c7be6ab14215..000000000000
--- a/editors/openoffice.org-3-devel/files/patch-i77829
+++ /dev/null
@@ -1,45 +0,0 @@
-g++42  -fmessage-length=0 -c -Os -fno-strict-aliasing   -ftemplate-depth-128 -I.  -I../../../unxfbsdi.pro/inc/chcdialogs -I../inc -I../../../source/inc -I../../../inc/pch -I../../../inc/chart2 -I../../../inc -I../../../unx/inc -I../../../unxfbsdi.pro/inc -I. -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/external -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/unxfbsdi/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/res -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc/Xp31 -I/usr/local/diablo-jdk1.5.0/include -I/usr/local/diablo-jdk1.5.0/include/freebsd -I/usr/local/diablo-jdk1.5.0/include/bsd -I/usr/local/diablo-jdk1.5.0/include/linux -I/usr/local/diablo-jdk1.5.0/include/native_threads/include -I/usr/local/include     -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/offuh -I. -I../../../res -I. -pipe -mtune=pentiumpro -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DINTEL -DCVER=C341 -DX86  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc-4.2.0/include/c++ -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DCUI -DSOLAR_JAVA -DSRC680=SRC680   -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../../unxfbsdi.pro/slo/DataBrowser.o /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx 
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/cppuhelper/implbase1.hxx:42,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/transfer.hxx:54,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/brwbox.hxx:56,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/editbrowsebox.hxx:69,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.hxx:40,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:51:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:305: warning: empty body in an else-statement
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor, DataCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:329: warning: empty body in an else-statement
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:52:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx: At global scope:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx:110: error: extra qualification 'chart::DataBrowserModel::' on member 'setCellAny'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'bool chart::DataBrowser::MaySwapColumns() const':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:574: warning: declaration of 'bHasFocus' shadows a member of 'this'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'void chart::DataBrowser::RenewTable()':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:634: warning: declaration of 'nRowCount' shadows a member of 'this'
-dmake:  Error code 1, while making '../../../unxfbsdi.pro/slo/DataBrowser.obj'
----* tg_merge.mk *---
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs
-dmake:  Error code 1, while making 'build_instsetoo_native'
----*  *---
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2-devel.
-
-Index: chart2/source/controller/dialogs/DataBrowserModel.hxx
-===================================================================
-RCS file: /cvs/graphics/chart2/source/controller/dialogs/DataBrowserModel.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 DataBrowserModel.hxx
---- chart2/source/controller/dialogs/DataBrowserModel.hxx	22 May 2007 17:27:59 -0000	1.2
-+++ chart2/source/controller/dialogs/DataBrowserModel.hxx	26 May 2007 10:47:37 -0000
-@@ -106,8 +106,7 @@
-     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
-     /// returns </TRUE> if the text could successfully be set at the given position
-     bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
--    bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow,
--                                       const ::com::sun::star::uno::Any & aValue );
-+    bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
- 
-     sal_Int32 getColumnCount() const;
-     sal_Int32 getMaxRowCount() const;
diff --git a/editors/openoffice.org-3-devel/files/patch-i78032 b/editors/openoffice.org-3-devel/files/patch-i78032
new file mode 100644
index 000000000000..e2b523c56e85
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-i78032
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.19
+diff -u -r1.19 makefile.mk
+--- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
++++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
+@@ -79,7 +79,7 @@
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELSE
+-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELIF "$(OS)"=="MACOSX"
+ .IF "$(CCNUMVER)"<="000399999999"
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 7263abc67477..bb179f369ef2 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -66,10 +66,10 @@ FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
 CODELINE=		680
-MILESTONE?=		213
+MILESTONE?=		214
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070525
+SNAPDATE=		20070601
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 .if defined(WITH_CWS)
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index b95fc19e9a46..8cf4905f1ea7 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 7120d049a1aa1801205d574abd1c77fd
-SHA256 (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 1f8edbecfa3e9c2122c2f3a0acbcd4c52620a86e5b1c06d93b04cce34b49ca7d
-SIZE (openoffice.org2/OOo_SRC680_m213_source.tar.bz2) = 270389079
+MD5 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = c7c709584daf02f4e9adf2a976e49b67
+SHA256 (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 1bb03531e034bf11eb9ea759e040e5263e57d7bfcd3fc71401de82e7a0efc0b5
+SIZE (openoffice.org2/OOo_SRC680_m214_source.tar.bz2) = 270455564
 MD5 (openoffice.org2/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i77793 b/editors/openoffice.org-vcltesttool/files/patch-i77793
deleted file mode 100644
index e182b8727409..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i77793
+++ /dev/null
@@ -1,11 +0,0 @@
---- sw/source/core/unocore/unotbl.cxx	2007-05-25 13:02:05.000000000 +0200
-+++ sw/source/core/unocore/unotbl.cxx	2007-05-25 13:09:00.000000000 +0200
-@@ -4455,7 +4455,7 @@
-                             // now we'll try to get a useful numerical value
-                             // from the text in the cell...
- 
--                            ULONG nFIndex;
-+                            sal_uInt32 nFIndex;
-                             SvNumberFormatter* pNumFormatter = pTblCrsr->GetDoc()->GetNumberFormatter();
- 
-                             // look for SwTblBoxNumFormat value in parents as well
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i77829 b/editors/openoffice.org-vcltesttool/files/patch-i77829
deleted file mode 100644
index c7be6ab14215..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i77829
+++ /dev/null
@@ -1,45 +0,0 @@
-g++42  -fmessage-length=0 -c -Os -fno-strict-aliasing   -ftemplate-depth-128 -I.  -I../../../unxfbsdi.pro/inc/chcdialogs -I../inc -I../../../source/inc -I../../../inc/pch -I../../../inc/chart2 -I../../../inc -I../../../unx/inc -I../../../unxfbsdi.pro/inc -I. -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/external -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/unxfbsdi/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/res -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/stl -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solenv/inc/Xp31 -I/usr/local/diablo-jdk1.5.0/include -I/usr/local/diablo-jdk1.5.0/include/freebsd -I/usr/local/diablo-jdk1.5.0/include/bsd -I/usr/local/diablo-jdk1.5.0/include/linux -I/usr/local/diablo-jdk1.5.0/include/native_threads/include -I/usr/local/include     -I/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/offuh -I. -I../../../res -I. -pipe -mtune=pentiumpro -fvisibility-inlines-hidden -g1 -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy     -Wno-non-virtual-dtor   -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341 -DINTEL -DCVER=C341 -DX86  -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DHAVE_GCC_VISIBILITY_FEATURE -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/local/lib/gcc-4.2.0/include/c++ -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DCUI -DSOLAR_JAVA -DSRC680=SRC680   -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON  -o ../../../unxfbsdi.pro/slo/DataBrowser.o /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx 
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/cppuhelper/implbase1.hxx:42,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/transfer.hxx:54,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/brwbox.hxx:56,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/svtools/editbrowsebox.hxx:69,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.hxx:40,
-                 from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:51:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:305: warning: empty body in an else-statement
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx: In static member function 'static Inst*<unnamed>::rtl_Instance<Inst, InstCtor, Guard, GuardCtor, Data, DataCtor>::create(InstCtor, GuardCtor, DataCtor)':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/solver/680/unxfbsdi.pro/inc/rtl/instance.hxx:329: warning: empty body in an else-statement
-In file included from /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:52:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx: At global scope:
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowserModel.hxx:110: error: extra qualification 'chart::DataBrowserModel::' on member 'setCellAny'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'bool chart::DataBrowser::MaySwapColumns() const':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:574: warning: declaration of 'bHasFocus' shadows a member of 'this'
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx: In member function 'void chart::DataBrowser::RenewTable()':
-/work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs/DataBrowser.cxx:634: warning: declaration of 'nRowCount' shadows a member of 'this'
-dmake:  Error code 1, while making '../../../unxfbsdi.pro/slo/DataBrowser.obj'
----* tg_merge.mk *---
-
-ERROR: Error 65280 occurred while making /work/ports/editors/openoffice.org-2-devel/work/SRC680_m213/chart2/source/controller/dialogs
-dmake:  Error code 1, while making 'build_instsetoo_native'
----*  *---
-*** Error code 255
-
-Stop in /work/ports/editors/openoffice.org-2-devel.
-
-Index: chart2/source/controller/dialogs/DataBrowserModel.hxx
-===================================================================
-RCS file: /cvs/graphics/chart2/source/controller/dialogs/DataBrowserModel.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 DataBrowserModel.hxx
---- chart2/source/controller/dialogs/DataBrowserModel.hxx	22 May 2007 17:27:59 -0000	1.2
-+++ chart2/source/controller/dialogs/DataBrowserModel.hxx	26 May 2007 10:47:37 -0000
-@@ -106,8 +106,7 @@
-     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
-     /// returns </TRUE> if the text could successfully be set at the given position
-     bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
--    bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow,
--                                       const ::com::sun::star::uno::Any & aValue );
-+    bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
- 
-     sal_Int32 getColumnCount() const;
-     sal_Int32 getMaxRowCount() const;
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i78032 b/editors/openoffice.org-vcltesttool/files/patch-i78032
new file mode 100644
index 000000000000..e2b523c56e85
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-i78032
@@ -0,0 +1,16 @@
+Index: store/util/makefile.mk
+===================================================================
+RCS file: /cvs/ucb/store/util/makefile.mk,v
+retrieving revision 1.19
+diff -u -r1.19 makefile.mk
+--- store/util/makefile.mk	26 Mar 2007 13:45:45 -0000	1.19
++++ store/util/makefile.mk	2 Jun 2007 01:40:18 -0000
+@@ -79,7 +79,7 @@
+ .IF "$(GUI)"=="WNT"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELSE
+-.IF "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD"
++.IF "$(OS)"=="NETBSD"
+ SHL1STDLIBS+= 	-lsupc++
+ .ELIF "$(OS)"=="MACOSX"
+ .IF "$(CCNUMVER)"<="000399999999"