Update to SRC680_m200.

The 200th milestone, congratulations!

5 files changed, 5 insertions, 59 deletions

diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index cfd11844f655..b480ff97d036 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -78,10 +78,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		199
+MILESTONE?=		200
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20070109
+SNAPDATE=		20070120
 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 1790325c13e8..802775ab7813 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m199_source.tar.bz2) = 3776c187a90bdcd1545272e72cc4c0d4
-SHA256 (openoffice.org2.0/OOo_SRC680_m199_source.tar.bz2) = cb0d33e07597e6e89db7cf3fc72da91c5eb771ee070e435a5e7035c1b297db09
-SIZE (openoffice.org2.0/OOo_SRC680_m199_source.tar.bz2) = 263860886
+MD5 (openoffice.org2.0/OOo_SRC680_m200_source.tar.bz2) = 30af797213ff7b025d7e391f7e00f6cf
+SHA256 (openoffice.org2.0/OOo_SRC680_m200_source.tar.bz2) = 268f591d00e58752e8f58eafc7735644582f9535e90b7e35587ea5618a57d818
+SIZE (openoffice.org2.0/OOo_SRC680_m200_source.tar.bz2) = 265394628
 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org2.0/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-2-devel/files/patch-i72903 b/editors/openoffice.org-2-devel/files/patch-i72903
deleted file mode 100644
index 6f4785d5f392..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i72903
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: toolkit/inc/toolkit/awt/xthrobber.hxx
-===================================================================
-RCS file: /cvs/gsl/toolkit/inc/toolkit/awt/xthrobber.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 xthrobber.hxx
---- toolkit/inc/toolkit/awt/xthrobber.hxx	20 Dec 2006 13:51:06 -0000	1.2
-+++ toolkit/inc/toolkit/awt/xthrobber.hxx	23 Dec 2006 01:36:26 -0000
-@@ -68,7 +68,7 @@
- 	{
-     private:
-         Throbber_Impl   *mpThrobber;
--        void SAL_CALL XThrobber::InitImageList() throw(::com::sun::star::uno::RuntimeException);
-+        void SAL_CALL InitImageList() throw(::com::sun::star::uno::RuntimeException);
- 
-     public:
-         XThrobber();
diff --git a/editors/openoffice.org-2-devel/files/patch-i73179 b/editors/openoffice.org-2-devel/files/patch-i73179
deleted file mode 100644
index 5e66ddcce659..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i73179
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: desktop/source/deployment/manager/dp_manager.h
-===================================================================
-RCS file: /cvs/framework/desktop/source/deployment/manager/dp_manager.h,v
-retrieving revision 1.9
-diff -u -p -r1.9 dp_manager.h
---- desktop/source/deployment/manager/dp_manager.h	20 Dec 2006 14:28:11 -0000	1.9
-+++ desktop/source/deployment/manager/dp_manager.h	5 Jan 2007 19:54:44 -0000
-@@ -96,7 +96,7 @@ class PackageManagerImpl : private ::dp_
-         css::uno::Reference<css::ucb::XCommandEnvironment> const &
-             wrappedCmdEnv );
- 
--	bool PackageManagerImpl::checkInstall(
-+	bool checkInstall(
- 		::rtl::OUString const & title, 
- 		css::uno::Reference<css::deployment::XPackage> const & package,
- 		css::uno::Reference<css::ucb::XCommandEnvironment> const & cmdEnv);
diff --git a/editors/openoffice.org-2-devel/files/patch-i73295 b/editors/openoffice.org-2-devel/files/patch-i73295
deleted file mode 100644
index b6fa187023cd..000000000000
--- a/editors/openoffice.org-2-devel/files/patch-i73295
+++ /dev/null
@@ -1,22 +0,0 @@
-? basctl/unxfbsdx.pro
-Index: basctl/source/inc/localizationmgr.hxx
-===================================================================
-RCS file: /cvs/script/basctl/source/inc/localizationmgr.hxx,v
-retrieving revision 1.2
-diff -u -r1.2 localizationmgr.hxx
---- basctl/source/inc/localizationmgr.hxx	2 Jan 2007 15:52:27 -0000	1.2
-+++ basctl/source/inc/localizationmgr.hxx	10 Jan 2007 05:14:09 -0000
-@@ -70,11 +70,11 @@
- 			::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >
- 			xStringResourceManager, HandleResourceMode eMode );
- 
--	void LocalizationMgr::enableResourceForAllLibraryDialogs( void )
-+	void enableResourceForAllLibraryDialogs( void )
- 	{
- 		implEnableDisableResourceForAllLibraryDialogs( SET_IDS );
- 	}
--	void LocalizationMgr::disableResourceForAllLibraryDialogs( void )
-+	void disableResourceForAllLibraryDialogs( void )
- 	{
- 		implEnableDisableResourceForAllLibraryDialogs( RESET_IDS );
- 	}