* Update to SRC680_m197.

* Fixes menu items.

20 files changed, 36 insertions, 1940 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 5a0f5c9..0165862 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -71,10 +71,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		196
+MILESTONE?=		197
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061207
+SNAPDATE=		20061216
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -258,6 +258,10 @@ post-install:
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
 			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+	@for app in base calc draw impress math printeradmin writer; do \
+		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+	done
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${PREFIX}/share/applications/${EXECBASE}
 	@${MKDIR} ${PREFIX}/share/applications
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index eb1da40..23db8c1 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 3814528e518342a63be679537bfd1a47
-SHA256 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 233c99f0b3e0ed7bd1dd2d49f867de77fbd1b628a33b3ba276828297b1effbaa
-SIZE (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 263576602
+MD5 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 76d205ec89fd6e8c25c409dabeebe3b2
+SHA256 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = fa63cb6f35a618ec8d52126b064188c174707865709a2a805dbb1e41b6201353
+SIZE (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 265445495
 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-3-devel/files/patch-i71451 b/editors/openoffice-3-devel/files/patch-i71451
deleted file mode 100644
index 323db8a..0000000
--- a/editors/openoffice-3-devel/files/patch-i71451
+++ /dev/null
@@ -1,138 +0,0 @@
---- binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:21:16.000000000 +0100
-@@ -59,7 +59,7 @@
- #include "numrule.hxx"
- namespace binfilter {
- 
--static ULONG  nNewFldFmt;                       // Aktueller Format-Wert
-+static UINT32  nNewFldFmt;                       // Aktueller Format-Wert
- 
- 
- static SwDBFieldType* In_SwDBFieldType( SwSwgReader& rPar )
-@@ -597,7 +597,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--                                       USHORT& rSubType, ULONG &rFmt,
-+                                       USHORT& rSubType, UINT32 &rFmt,
-                                        USHORT nVersion );
- 
- SwField* SwSwgReader::InField()
-
---- binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:13:33.000000000 +0100
-@@ -38,7 +38,7 @@
- #ifndef _SOLAR_H
- #include <tools/solar.h>
- #endif
--class String; 
-+class String;
- namespace binfilter {
- 
- 
-@@ -48,7 +48,7 @@
- #if defined(BLC) || defined(MAC)
- // BLC will es auf jeden Fall hier
- typedef void				( ValueFormBuffer::*Fkt_rString )( String & );
--typedef ULONG				( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+typedef sal_uInt32          ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
- class ValueFormBuffer
-@@ -57,13 +57,13 @@
- #if !defined(BLC) && !defined(MAC)
- // MSC will es auf jeden Fall hier
- 		typedef void		( ValueFormBuffer::*Fkt_rString )( String & );
--		typedef ULONG		( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+        typedef sal_uInt32  ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
--		ULONG				*pHandles;		// Array mit Handles...
-+        sal_uInt32          *pHandles;      // Array mit Handles...
- 		USHORT				nMax;  			// Groesse des Arrays
- 		USHORT				nCount;			// Index des naechsten freien Eintrags
--		ULONG				nDefaultHandle;
-+        sal_uInt32          nDefaultHandle;
- 
- 		// nur fuer Excel5
- 		static const USHORT nAnzBuiltin;	// bekannte Formate
-@@ -76,11 +76,11 @@
- 		void				Init( void );
- 							// fuer 1. Nutzung
- 		void				__NewValueFormat( String &rFormString );
--		ULONG				__GetValueFormat( USHORT nExcIndex );
-+        sal_uInt32          __GetValueFormat( USHORT nExcIndex );
- 							// fuer n-te Nutzung
- 		void				_NewValueFormatX( String &rFormString );
- 		void				_NewValueFormat5( String &rFormString );
--		ULONG				_GetValueFormatX5( USHORT nExcIndex );
-+        sal_uInt32          _GetValueFormatX5( USHORT nExcIndex );
- 	public:
- 		ValueFormBuffer( const USHORT nSize = 2048 );
- 		~ValueFormBuffer();
-
---- binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:14:22.000000000 +0100
-@@ -208,7 +208,7 @@
- 		inline void		GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
- 							const SfxItemSet *pBoxAttr );
- 
--		ULONG			GetNumFormat( USHORT nIndex );
-+		sal_uInt32		GetNumFormat( USHORT nIndex );
- 		void			SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
- 							USHORT nXF );
- #ifdef USED
-
---- binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:13:33.000000000 +0100
-@@ -1167,7 +1167,7 @@
- 	}
- 
- // --------------------------------------------- XF_Buffer::GetNumFormat -
--UINT32 XF_Buffer::GetNumFormat( UINT16 nIndex )
-+sal_uInt32 XF_Buffer::GetNumFormat( UINT16 nIndex )
- 	{
- //	DBG_ASSERT( nIndex < nCount ,
- //		"+XF_Buffer::GetNumFormat(): das ist zuviel des Guten!" );
-
---- binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:22:51.000000000 +0100
-@@ -5001,7 +5001,7 @@
- }
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--										USHORT& rSubType, ULONG &rFmt,
-+										USHORT& rSubType, UINT32 &rFmt,
- 										USHORT nVersion );
- 
- BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
-@@ -5329,7 +5329,7 @@
- 					case 'U':
- 					{
- 						USHORT nSubType = TIMEFLD, nWhich = RES_DATETIMEFLD;
--						ULONG nFormat = (ULONG)TF_SSMM_24;
-+						UINT32 nFormat = (UINT32)TF_SSMM_24;
- 						sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
- 
-@@ -5351,7 +5351,7 @@
- 								case 'M':eDat=DF_LMONTH; break;
- 							}
- 							USHORT nSubType = DATEFLD, nWhich = RES_DATETIMEFLD;
--							ULONG nFormat = (ULONG)eDat;
-+							UINT32 nFormat = (UINT32)eDat;
- 
- 							sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
-
---- binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:15:29.000000000 +0100
-@@ -1918,7 +1918,7 @@
- 		// tell the Formatter about the new entry
- 		UINT16 nCheckPos = 0;
- 		INT16  nType = NUMBERFORMAT_DEFINED;
--		ULONG  nKey;
-+		sal_uInt32  nKey;
- 
- 		pFormatter->PutandConvertEntry( *pFirst, nCheckPos, nType, nKey,
- 										LANGUAGE_GERMAN,
diff --git a/editors/openoffice-3-devel/files/patch-i72236 b/editors/openoffice-3-devel/files/patch-i72236
deleted file mode 100644
index 3b4d0d4..0000000
--- a/editors/openoffice-3-devel/files/patch-i72236
+++ /dev/null
@@ -1,11 +0,0 @@
---- svtools/source/items1/stylepool.cxx	2006-12-10 20:59:39.000000000 +0100
-+++ svtools/source/items1/stylepool.cxx	2006-12-10 20:59:57.000000000 +0100
-@@ -187,7 +187,7 @@
- 
- ::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
- {
--    return ::rtl::OUString::valueOf( reinterpret_cast<sal_Int32>( pSet.get() ), 16 );
-+    return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
- }
- 
- // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/editors/openoffice-3-devel/files/patch-i72372 b/editors/openoffice-3-devel/files/patch-i72372
deleted file mode 100644
index 081bc08..0000000
--- a/editors/openoffice-3-devel/files/patch-i72372
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: shlib.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/shlib.cxx,v
-retrieving revision 1.25
-diff -u -r1.25 shlib.cxx
---- cppuhelper/source/shlib.cxx	1 Dec 2006 17:18:35 -0000	1.25
-+++ cppuhelper/source/shlib.cxx	8 Dec 2006 16:31:16 -0000
-@@ -311,7 +311,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -319,17 +318,6 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY);
-         pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
-         if (pSym != 0)
-@@ -337,59 +325,97 @@
-             OString aImplName(
-                 OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
- 
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL &&aEnvTypeName.equalsAsciiL(
-+                 RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                XInterface * pRet =
-+                    (XInterface *) (*((component_getFactoryFunc) pSym))(
-+                        aImplName.getStr(), xMgr.get(), xKey.get() );
-+                if (pRet)
-+                {
-+                    xRet = pRet;
-+                    pRet->release();
-+                }
-+                else
-+                {
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": cannot get factory of demanded "
-+                                     "implementation: ");
-+                    aExcMsg += OStringToOUString(
-+                        aImplName, RTL_TEXTENCODING_ASCII_US );
-+                }
-+			}
-+			else
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				Mapping aEnv2Current( pEnv, pCurrentEnv );
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
- 
--				if (aCurrent2Env.is() && aEnv2Current.is())
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					
--					void * pSSF =
--						(*((component_getFactoryFunc) pSym))(
--							aImplName.getStr(), pSMgr, pKey );
--					
--					if (pKey)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--					}
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
--					}
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					Mapping aEnv2Current( pEnv, pCurrentEnv );
- 					
--					if (pSSF)
-+					if (aCurrent2Env.is() && aEnv2Current.is())
- 					{
--						aEnv2Current.mapInterface(
--							reinterpret_cast< void ** >( &xRet ),
--							pSSF, ::getCppuType( &xRet ) );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSSF );
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						
-+						void * pSSF =
-+							(*((component_getFactoryFunc) pSym))(
-+								aImplName.getStr(), pSMgr, pKey );
-+						
-+						if (pKey)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+						}
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
-+						}
-+						
-+						if (pSSF)
-+						{
-+							aEnv2Current.mapInterface(
-+								reinterpret_cast< void ** >( &xRet ),
-+								pSSF, ::getCppuType( &xRet ) );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSSF );
-+						}
-+						else
-+						{
-+							aExcMsg = aModulePath;
-+							aExcMsg += OUSTR(": cannot get factory of "
-+											 "demanded implementation: ");
-+							aExcMsg += OStringToOUString(
-+								aImplName, RTL_TEXTENCODING_ASCII_US );
-+						}
- 					}
- 					else
- 					{
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": cannot get factory of "
--										 "demanded implementation: ");
--						aExcMsg += OStringToOUString(
--							aImplName, RTL_TEXTENCODING_ASCII_US );
-+						aExcMsg =
-+							OUSTR("cannot get uno mappings: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg =
--						OUSTR("cannot get uno mappings: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -401,8 +427,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
-@@ -463,7 +487,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -471,65 +494,92 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
-         pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
-         if (pSym != 0)
-         {
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL && aEnvTypeName.equalsAsciiL(
-+					RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                if (xKey.is())
-+                {
-+                    bRet = (*((component_writeInfoFunc) pSym))(
-+                        xMgr.get(), xKey.get() );
-+                    if (! bRet)
-+                    {
-+                        aExcMsg = aModulePath;
-+                        aExcMsg += OUSTR(": component_writeInfo() returned "
-+                                         "false!");
-+                    }
-+                }
-+                else
-+                {
-+                    // key is mandatory
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": registry is mandatory to invoke "
-+                                     "component_writeInfo()!");
-+                }
-+			}
-+			else 
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				if (aCurrent2Env.is())
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
-+
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					if (pKey)
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					if (aCurrent2Env.is())
- 					{
--						bRet = (*((component_writeInfoFunc) pSym))(
--							pSMgr, pKey );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--						if (! bRet)
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						if (pKey)
-+						{
-+							bRet = (*((component_writeInfoFunc) pSym))(
-+								pSMgr, pKey );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+							if (! bRet)
-+							{
-+								aExcMsg = aModulePath;
-+								aExcMsg += OUSTR(": component_writeInfo() "
-+												 "returned false!");
-+							}
-+						}
-+						else
- 						{
-+							// key is mandatory
- 							aExcMsg = aModulePath;
--							aExcMsg += OUSTR(": component_writeInfo() "
--											 "returned false!");
-+							aExcMsg += OUSTR(": registry is mandatory to invoke"
-+											 " component_writeInfo()!");
-+						}
-+						
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
- 						}
- 					}
- 					else
- 					{
--						// key is mandatory
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": registry is mandatory to invoke"
--										 " component_writeInfo()!");
--					}
--					
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
-+						aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -541,8 +591,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 5a0f5c9..0165862 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -71,10 +71,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		196
+MILESTONE?=		197
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061207
+SNAPDATE=		20061216
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -258,6 +258,10 @@ post-install:
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
 			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+	@for app in base calc draw impress math printeradmin writer; do \
+		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+	done
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${PREFIX}/share/applications/${EXECBASE}
 	@${MKDIR} ${PREFIX}/share/applications
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index eb1da40..23db8c1 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_m196_source.tar.bz2) = 3814528e518342a63be679537bfd1a47
-SHA256 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 233c99f0b3e0ed7bd1dd2d49f867de77fbd1b628a33b3ba276828297b1effbaa
-SIZE (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 263576602
+MD5 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 76d205ec89fd6e8c25c409dabeebe3b2
+SHA256 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = fa63cb6f35a618ec8d52126b064188c174707865709a2a805dbb1e41b6201353
+SIZE (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 265445495
 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-i71451 b/editors/openoffice.org-2-devel/files/patch-i71451
deleted file mode 100644
index 323db8a..0000000
--- a/editors/openoffice.org-2-devel/files/patch-i71451
+++ /dev/null
@@ -1,138 +0,0 @@
---- binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:21:16.000000000 +0100
-@@ -59,7 +59,7 @@
- #include "numrule.hxx"
- namespace binfilter {
- 
--static ULONG  nNewFldFmt;                       // Aktueller Format-Wert
-+static UINT32  nNewFldFmt;                       // Aktueller Format-Wert
- 
- 
- static SwDBFieldType* In_SwDBFieldType( SwSwgReader& rPar )
-@@ -597,7 +597,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--                                       USHORT& rSubType, ULONG &rFmt,
-+                                       USHORT& rSubType, UINT32 &rFmt,
-                                        USHORT nVersion );
- 
- SwField* SwSwgReader::InField()
-
---- binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:13:33.000000000 +0100
-@@ -38,7 +38,7 @@
- #ifndef _SOLAR_H
- #include <tools/solar.h>
- #endif
--class String; 
-+class String;
- namespace binfilter {
- 
- 
-@@ -48,7 +48,7 @@
- #if defined(BLC) || defined(MAC)
- // BLC will es auf jeden Fall hier
- typedef void				( ValueFormBuffer::*Fkt_rString )( String & );
--typedef ULONG				( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+typedef sal_uInt32          ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
- class ValueFormBuffer
-@@ -57,13 +57,13 @@
- #if !defined(BLC) && !defined(MAC)
- // MSC will es auf jeden Fall hier
- 		typedef void		( ValueFormBuffer::*Fkt_rString )( String & );
--		typedef ULONG		( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+        typedef sal_uInt32  ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
--		ULONG				*pHandles;		// Array mit Handles...
-+        sal_uInt32          *pHandles;      // Array mit Handles...
- 		USHORT				nMax;  			// Groesse des Arrays
- 		USHORT				nCount;			// Index des naechsten freien Eintrags
--		ULONG				nDefaultHandle;
-+        sal_uInt32          nDefaultHandle;
- 
- 		// nur fuer Excel5
- 		static const USHORT nAnzBuiltin;	// bekannte Formate
-@@ -76,11 +76,11 @@
- 		void				Init( void );
- 							// fuer 1. Nutzung
- 		void				__NewValueFormat( String &rFormString );
--		ULONG				__GetValueFormat( USHORT nExcIndex );
-+        sal_uInt32          __GetValueFormat( USHORT nExcIndex );
- 							// fuer n-te Nutzung
- 		void				_NewValueFormatX( String &rFormString );
- 		void				_NewValueFormat5( String &rFormString );
--		ULONG				_GetValueFormatX5( USHORT nExcIndex );
-+        sal_uInt32          _GetValueFormatX5( USHORT nExcIndex );
- 	public:
- 		ValueFormBuffer( const USHORT nSize = 2048 );
- 		~ValueFormBuffer();
-
---- binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:14:22.000000000 +0100
-@@ -208,7 +208,7 @@
- 		inline void		GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
- 							const SfxItemSet *pBoxAttr );
- 
--		ULONG			GetNumFormat( USHORT nIndex );
-+		sal_uInt32		GetNumFormat( USHORT nIndex );
- 		void			SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
- 							USHORT nXF );
- #ifdef USED
-
---- binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:13:33.000000000 +0100
-@@ -1167,7 +1167,7 @@
- 	}
- 
- // --------------------------------------------- XF_Buffer::GetNumFormat -
--UINT32 XF_Buffer::GetNumFormat( UINT16 nIndex )
-+sal_uInt32 XF_Buffer::GetNumFormat( UINT16 nIndex )
- 	{
- //	DBG_ASSERT( nIndex < nCount ,
- //		"+XF_Buffer::GetNumFormat(): das ist zuviel des Guten!" );
-
---- binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:22:51.000000000 +0100
-@@ -5001,7 +5001,7 @@
- }
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--										USHORT& rSubType, ULONG &rFmt,
-+										USHORT& rSubType, UINT32 &rFmt,
- 										USHORT nVersion );
- 
- BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
-@@ -5329,7 +5329,7 @@
- 					case 'U':
- 					{
- 						USHORT nSubType = TIMEFLD, nWhich = RES_DATETIMEFLD;
--						ULONG nFormat = (ULONG)TF_SSMM_24;
-+						UINT32 nFormat = (UINT32)TF_SSMM_24;
- 						sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
- 
-@@ -5351,7 +5351,7 @@
- 								case 'M':eDat=DF_LMONTH; break;
- 							}
- 							USHORT nSubType = DATEFLD, nWhich = RES_DATETIMEFLD;
--							ULONG nFormat = (ULONG)eDat;
-+							UINT32 nFormat = (UINT32)eDat;
- 
- 							sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
-
---- binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:15:29.000000000 +0100
-@@ -1918,7 +1918,7 @@
- 		// tell the Formatter about the new entry
- 		UINT16 nCheckPos = 0;
- 		INT16  nType = NUMBERFORMAT_DEFINED;
--		ULONG  nKey;
-+		sal_uInt32  nKey;
- 
- 		pFormatter->PutandConvertEntry( *pFirst, nCheckPos, nType, nKey,
- 										LANGUAGE_GERMAN,
diff --git a/editors/openoffice.org-2-devel/files/patch-i72236 b/editors/openoffice.org-2-devel/files/patch-i72236
deleted file mode 100644
index 3b4d0d4..0000000
--- a/editors/openoffice.org-2-devel/files/patch-i72236
+++ /dev/null
@@ -1,11 +0,0 @@
---- svtools/source/items1/stylepool.cxx	2006-12-10 20:59:39.000000000 +0100
-+++ svtools/source/items1/stylepool.cxx	2006-12-10 20:59:57.000000000 +0100
-@@ -187,7 +187,7 @@
- 
- ::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
- {
--    return ::rtl::OUString::valueOf( reinterpret_cast<sal_Int32>( pSet.get() ), 16 );
-+    return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
- }
- 
- // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/editors/openoffice.org-2-devel/files/patch-i72372 b/editors/openoffice.org-2-devel/files/patch-i72372
deleted file mode 100644
index 081bc08..0000000
--- a/editors/openoffice.org-2-devel/files/patch-i72372
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: shlib.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/shlib.cxx,v
-retrieving revision 1.25
-diff -u -r1.25 shlib.cxx
---- cppuhelper/source/shlib.cxx	1 Dec 2006 17:18:35 -0000	1.25
-+++ cppuhelper/source/shlib.cxx	8 Dec 2006 16:31:16 -0000
-@@ -311,7 +311,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -319,17 +318,6 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY);
-         pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
-         if (pSym != 0)
-@@ -337,59 +325,97 @@
-             OString aImplName(
-                 OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
- 
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL &&aEnvTypeName.equalsAsciiL(
-+                 RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                XInterface * pRet =
-+                    (XInterface *) (*((component_getFactoryFunc) pSym))(
-+                        aImplName.getStr(), xMgr.get(), xKey.get() );
-+                if (pRet)
-+                {
-+                    xRet = pRet;
-+                    pRet->release();
-+                }
-+                else
-+                {
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": cannot get factory of demanded "
-+                                     "implementation: ");
-+                    aExcMsg += OStringToOUString(
-+                        aImplName, RTL_TEXTENCODING_ASCII_US );
-+                }
-+			}
-+			else
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				Mapping aEnv2Current( pEnv, pCurrentEnv );
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
- 
--				if (aCurrent2Env.is() && aEnv2Current.is())
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					
--					void * pSSF =
--						(*((component_getFactoryFunc) pSym))(
--							aImplName.getStr(), pSMgr, pKey );
--					
--					if (pKey)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--					}
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
--					}
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					Mapping aEnv2Current( pEnv, pCurrentEnv );
- 					
--					if (pSSF)
-+					if (aCurrent2Env.is() && aEnv2Current.is())
- 					{
--						aEnv2Current.mapInterface(
--							reinterpret_cast< void ** >( &xRet ),
--							pSSF, ::getCppuType( &xRet ) );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSSF );
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						
-+						void * pSSF =
-+							(*((component_getFactoryFunc) pSym))(
-+								aImplName.getStr(), pSMgr, pKey );
-+						
-+						if (pKey)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+						}
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
-+						}
-+						
-+						if (pSSF)
-+						{
-+							aEnv2Current.mapInterface(
-+								reinterpret_cast< void ** >( &xRet ),
-+								pSSF, ::getCppuType( &xRet ) );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSSF );
-+						}
-+						else
-+						{
-+							aExcMsg = aModulePath;
-+							aExcMsg += OUSTR(": cannot get factory of "
-+											 "demanded implementation: ");
-+							aExcMsg += OStringToOUString(
-+								aImplName, RTL_TEXTENCODING_ASCII_US );
-+						}
- 					}
- 					else
- 					{
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": cannot get factory of "
--										 "demanded implementation: ");
--						aExcMsg += OStringToOUString(
--							aImplName, RTL_TEXTENCODING_ASCII_US );
-+						aExcMsg =
-+							OUSTR("cannot get uno mappings: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg =
--						OUSTR("cannot get uno mappings: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -401,8 +427,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
-@@ -463,7 +487,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -471,65 +494,92 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
-         pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
-         if (pSym != 0)
-         {
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL && aEnvTypeName.equalsAsciiL(
-+					RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                if (xKey.is())
-+                {
-+                    bRet = (*((component_writeInfoFunc) pSym))(
-+                        xMgr.get(), xKey.get() );
-+                    if (! bRet)
-+                    {
-+                        aExcMsg = aModulePath;
-+                        aExcMsg += OUSTR(": component_writeInfo() returned "
-+                                         "false!");
-+                    }
-+                }
-+                else
-+                {
-+                    // key is mandatory
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": registry is mandatory to invoke "
-+                                     "component_writeInfo()!");
-+                }
-+			}
-+			else 
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				if (aCurrent2Env.is())
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
-+
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					if (pKey)
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					if (aCurrent2Env.is())
- 					{
--						bRet = (*((component_writeInfoFunc) pSym))(
--							pSMgr, pKey );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--						if (! bRet)
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						if (pKey)
-+						{
-+							bRet = (*((component_writeInfoFunc) pSym))(
-+								pSMgr, pKey );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+							if (! bRet)
-+							{
-+								aExcMsg = aModulePath;
-+								aExcMsg += OUSTR(": component_writeInfo() "
-+												 "returned false!");
-+							}
-+						}
-+						else
- 						{
-+							// key is mandatory
- 							aExcMsg = aModulePath;
--							aExcMsg += OUSTR(": component_writeInfo() "
--											 "returned false!");
-+							aExcMsg += OUSTR(": registry is mandatory to invoke"
-+											 " component_writeInfo()!");
-+						}
-+						
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
- 						}
- 					}
- 					else
- 					{
--						// key is mandatory
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": registry is mandatory to invoke"
--										 " component_writeInfo()!");
--					}
--					
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
-+						aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -541,8 +591,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 5a0f5c9..0165862 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -71,10 +71,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		196
+MILESTONE?=		197
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061207
+SNAPDATE=		20061216
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -258,6 +258,10 @@ post-install:
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
 			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+	@for app in base calc draw impress math printeradmin writer; do \
+		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+	done
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${PREFIX}/share/applications/${EXECBASE}
 	@${MKDIR} ${PREFIX}/share/applications
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index eb1da40..23db8c1 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 3814528e518342a63be679537bfd1a47
-SHA256 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 233c99f0b3e0ed7bd1dd2d49f867de77fbd1b628a33b3ba276828297b1effbaa
-SIZE (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 263576602
+MD5 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 76d205ec89fd6e8c25c409dabeebe3b2
+SHA256 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = fa63cb6f35a618ec8d52126b064188c174707865709a2a805dbb1e41b6201353
+SIZE (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 265445495
 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-3-devel/files/patch-i71451 b/editors/openoffice.org-3-devel/files/patch-i71451
deleted file mode 100644
index 323db8a..0000000
--- a/editors/openoffice.org-3-devel/files/patch-i71451
+++ /dev/null
@@ -1,138 +0,0 @@
---- binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:21:16.000000000 +0100
-@@ -59,7 +59,7 @@
- #include "numrule.hxx"
- namespace binfilter {
- 
--static ULONG  nNewFldFmt;                       // Aktueller Format-Wert
-+static UINT32  nNewFldFmt;                       // Aktueller Format-Wert
- 
- 
- static SwDBFieldType* In_SwDBFieldType( SwSwgReader& rPar )
-@@ -597,7 +597,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--                                       USHORT& rSubType, ULONG &rFmt,
-+                                       USHORT& rSubType, UINT32 &rFmt,
-                                        USHORT nVersion );
- 
- SwField* SwSwgReader::InField()
-
---- binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:13:33.000000000 +0100
-@@ -38,7 +38,7 @@
- #ifndef _SOLAR_H
- #include <tools/solar.h>
- #endif
--class String; 
-+class String;
- namespace binfilter {
- 
- 
-@@ -48,7 +48,7 @@
- #if defined(BLC) || defined(MAC)
- // BLC will es auf jeden Fall hier
- typedef void				( ValueFormBuffer::*Fkt_rString )( String & );
--typedef ULONG				( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+typedef sal_uInt32          ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
- class ValueFormBuffer
-@@ -57,13 +57,13 @@
- #if !defined(BLC) && !defined(MAC)
- // MSC will es auf jeden Fall hier
- 		typedef void		( ValueFormBuffer::*Fkt_rString )( String & );
--		typedef ULONG		( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+        typedef sal_uInt32  ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
--		ULONG				*pHandles;		// Array mit Handles...
-+        sal_uInt32          *pHandles;      // Array mit Handles...
- 		USHORT				nMax;  			// Groesse des Arrays
- 		USHORT				nCount;			// Index des naechsten freien Eintrags
--		ULONG				nDefaultHandle;
-+        sal_uInt32          nDefaultHandle;
- 
- 		// nur fuer Excel5
- 		static const USHORT nAnzBuiltin;	// bekannte Formate
-@@ -76,11 +76,11 @@
- 		void				Init( void );
- 							// fuer 1. Nutzung
- 		void				__NewValueFormat( String &rFormString );
--		ULONG				__GetValueFormat( USHORT nExcIndex );
-+        sal_uInt32          __GetValueFormat( USHORT nExcIndex );
- 							// fuer n-te Nutzung
- 		void				_NewValueFormatX( String &rFormString );
- 		void				_NewValueFormat5( String &rFormString );
--		ULONG				_GetValueFormatX5( USHORT nExcIndex );
-+        sal_uInt32          _GetValueFormatX5( USHORT nExcIndex );
- 	public:
- 		ValueFormBuffer( const USHORT nSize = 2048 );
- 		~ValueFormBuffer();
-
---- binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:14:22.000000000 +0100
-@@ -208,7 +208,7 @@
- 		inline void		GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
- 							const SfxItemSet *pBoxAttr );
- 
--		ULONG			GetNumFormat( USHORT nIndex );
-+		sal_uInt32		GetNumFormat( USHORT nIndex );
- 		void			SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
- 							USHORT nXF );
- #ifdef USED
-
---- binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:13:33.000000000 +0100
-@@ -1167,7 +1167,7 @@
- 	}
- 
- // --------------------------------------------- XF_Buffer::GetNumFormat -
--UINT32 XF_Buffer::GetNumFormat( UINT16 nIndex )
-+sal_uInt32 XF_Buffer::GetNumFormat( UINT16 nIndex )
- 	{
- //	DBG_ASSERT( nIndex < nCount ,
- //		"+XF_Buffer::GetNumFormat(): das ist zuviel des Guten!" );
-
---- binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:22:51.000000000 +0100
-@@ -5001,7 +5001,7 @@
- }
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--										USHORT& rSubType, ULONG &rFmt,
-+										USHORT& rSubType, UINT32 &rFmt,
- 										USHORT nVersion );
- 
- BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
-@@ -5329,7 +5329,7 @@
- 					case 'U':
- 					{
- 						USHORT nSubType = TIMEFLD, nWhich = RES_DATETIMEFLD;
--						ULONG nFormat = (ULONG)TF_SSMM_24;
-+						UINT32 nFormat = (UINT32)TF_SSMM_24;
- 						sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
- 
-@@ -5351,7 +5351,7 @@
- 								case 'M':eDat=DF_LMONTH; break;
- 							}
- 							USHORT nSubType = DATEFLD, nWhich = RES_DATETIMEFLD;
--							ULONG nFormat = (ULONG)eDat;
-+							UINT32 nFormat = (UINT32)eDat;
- 
- 							sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
-
---- binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:15:29.000000000 +0100
-@@ -1918,7 +1918,7 @@
- 		// tell the Formatter about the new entry
- 		UINT16 nCheckPos = 0;
- 		INT16  nType = NUMBERFORMAT_DEFINED;
--		ULONG  nKey;
-+		sal_uInt32  nKey;
- 
- 		pFormatter->PutandConvertEntry( *pFirst, nCheckPos, nType, nKey,
- 										LANGUAGE_GERMAN,
diff --git a/editors/openoffice.org-3-devel/files/patch-i72236 b/editors/openoffice.org-3-devel/files/patch-i72236
deleted file mode 100644
index 3b4d0d4..0000000
--- a/editors/openoffice.org-3-devel/files/patch-i72236
+++ /dev/null
@@ -1,11 +0,0 @@
---- svtools/source/items1/stylepool.cxx	2006-12-10 20:59:39.000000000 +0100
-+++ svtools/source/items1/stylepool.cxx	2006-12-10 20:59:57.000000000 +0100
-@@ -187,7 +187,7 @@
- 
- ::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
- {
--    return ::rtl::OUString::valueOf( reinterpret_cast<sal_Int32>( pSet.get() ), 16 );
-+    return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
- }
- 
- // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/editors/openoffice.org-3-devel/files/patch-i72372 b/editors/openoffice.org-3-devel/files/patch-i72372
deleted file mode 100644
index 081bc08..0000000
--- a/editors/openoffice.org-3-devel/files/patch-i72372
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: shlib.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/shlib.cxx,v
-retrieving revision 1.25
-diff -u -r1.25 shlib.cxx
---- cppuhelper/source/shlib.cxx	1 Dec 2006 17:18:35 -0000	1.25
-+++ cppuhelper/source/shlib.cxx	8 Dec 2006 16:31:16 -0000
-@@ -311,7 +311,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -319,17 +318,6 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY);
-         pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
-         if (pSym != 0)
-@@ -337,59 +325,97 @@
-             OString aImplName(
-                 OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
- 
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL &&aEnvTypeName.equalsAsciiL(
-+                 RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                XInterface * pRet =
-+                    (XInterface *) (*((component_getFactoryFunc) pSym))(
-+                        aImplName.getStr(), xMgr.get(), xKey.get() );
-+                if (pRet)
-+                {
-+                    xRet = pRet;
-+                    pRet->release();
-+                }
-+                else
-+                {
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": cannot get factory of demanded "
-+                                     "implementation: ");
-+                    aExcMsg += OStringToOUString(
-+                        aImplName, RTL_TEXTENCODING_ASCII_US );
-+                }
-+			}
-+			else
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				Mapping aEnv2Current( pEnv, pCurrentEnv );
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
- 
--				if (aCurrent2Env.is() && aEnv2Current.is())
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					
--					void * pSSF =
--						(*((component_getFactoryFunc) pSym))(
--							aImplName.getStr(), pSMgr, pKey );
--					
--					if (pKey)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--					}
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
--					}
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					Mapping aEnv2Current( pEnv, pCurrentEnv );
- 					
--					if (pSSF)
-+					if (aCurrent2Env.is() && aEnv2Current.is())
- 					{
--						aEnv2Current.mapInterface(
--							reinterpret_cast< void ** >( &xRet ),
--							pSSF, ::getCppuType( &xRet ) );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSSF );
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						
-+						void * pSSF =
-+							(*((component_getFactoryFunc) pSym))(
-+								aImplName.getStr(), pSMgr, pKey );
-+						
-+						if (pKey)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+						}
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
-+						}
-+						
-+						if (pSSF)
-+						{
-+							aEnv2Current.mapInterface(
-+								reinterpret_cast< void ** >( &xRet ),
-+								pSSF, ::getCppuType( &xRet ) );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSSF );
-+						}
-+						else
-+						{
-+							aExcMsg = aModulePath;
-+							aExcMsg += OUSTR(": cannot get factory of "
-+											 "demanded implementation: ");
-+							aExcMsg += OStringToOUString(
-+								aImplName, RTL_TEXTENCODING_ASCII_US );
-+						}
- 					}
- 					else
- 					{
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": cannot get factory of "
--										 "demanded implementation: ");
--						aExcMsg += OStringToOUString(
--							aImplName, RTL_TEXTENCODING_ASCII_US );
-+						aExcMsg =
-+							OUSTR("cannot get uno mappings: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg =
--						OUSTR("cannot get uno mappings: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -401,8 +427,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
-@@ -463,7 +487,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -471,65 +494,92 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
-         pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
-         if (pSym != 0)
-         {
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL && aEnvTypeName.equalsAsciiL(
-+					RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                if (xKey.is())
-+                {
-+                    bRet = (*((component_writeInfoFunc) pSym))(
-+                        xMgr.get(), xKey.get() );
-+                    if (! bRet)
-+                    {
-+                        aExcMsg = aModulePath;
-+                        aExcMsg += OUSTR(": component_writeInfo() returned "
-+                                         "false!");
-+                    }
-+                }
-+                else
-+                {
-+                    // key is mandatory
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": registry is mandatory to invoke "
-+                                     "component_writeInfo()!");
-+                }
-+			}
-+			else 
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				if (aCurrent2Env.is())
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
-+
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					if (pKey)
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					if (aCurrent2Env.is())
- 					{
--						bRet = (*((component_writeInfoFunc) pSym))(
--							pSMgr, pKey );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--						if (! bRet)
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						if (pKey)
-+						{
-+							bRet = (*((component_writeInfoFunc) pSym))(
-+								pSMgr, pKey );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+							if (! bRet)
-+							{
-+								aExcMsg = aModulePath;
-+								aExcMsg += OUSTR(": component_writeInfo() "
-+												 "returned false!");
-+							}
-+						}
-+						else
- 						{
-+							// key is mandatory
- 							aExcMsg = aModulePath;
--							aExcMsg += OUSTR(": component_writeInfo() "
--											 "returned false!");
-+							aExcMsg += OUSTR(": registry is mandatory to invoke"
-+											 " component_writeInfo()!");
-+						}
-+						
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
- 						}
- 					}
- 					else
- 					{
--						// key is mandatory
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": registry is mandatory to invoke"
--										 " component_writeInfo()!");
--					}
--					
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
-+						aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -541,8 +591,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 5a0f5c9..0165862 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -71,10 +71,10 @@ IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
-MILESTONE?=		196
+MILESTONE?=		197
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
-SNAPDATE=		20061207
+SNAPDATE=		20061216
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOTAG}
 EXECBASE?=		openoffice.org-${OOOTAG}
 DIST_SUBDIR=		openoffice.org2.0
@@ -258,6 +258,10 @@ post-install:
 	@${ECHO_CMD} "" > ${TMPPLIST}
 	@${REINPLACE_CMD} -e '/^Exec/s/printeradmin/spadmin/' \
 			${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop
+	@for app in base calc draw impress math printeradmin writer; do \
+		${REINPLACE_CMD} -e "s/^Exec.*/Exec=${EXECBASE} -$${app} %U/" \
+		${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/$${app}.desktop ; \
+	done
 	@${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak
 	@${RM} -f ${PREFIX}/share/applications/${EXECBASE}
 	@${MKDIR} ${PREFIX}/share/applications
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index eb1da40..23db8c1 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 3814528e518342a63be679537bfd1a47
-SHA256 (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 233c99f0b3e0ed7bd1dd2d49f867de77fbd1b628a33b3ba276828297b1effbaa
-SIZE (openoffice.org2.0/OOo_SRC680_m196_source.tar.bz2) = 263576602
+MD5 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 76d205ec89fd6e8c25c409dabeebe3b2
+SHA256 (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = fa63cb6f35a618ec8d52126b064188c174707865709a2a805dbb1e41b6201353
+SIZE (openoffice.org2.0/OOo_SRC680_m197_source.tar.bz2) = 265445495
 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-vcltesttool/files/patch-i71451 b/editors/openoffice.org-vcltesttool/files/patch-i71451
deleted file mode 100644
index 323db8a..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i71451
+++ /dev/null
@@ -1,138 +0,0 @@
---- binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/core/swg/sw_rdflds.cxx	2006-11-22 10:21:16.000000000 +0100
-@@ -59,7 +59,7 @@
- #include "numrule.hxx"
- namespace binfilter {
- 
--static ULONG  nNewFldFmt;                       // Aktueller Format-Wert
-+static UINT32  nNewFldFmt;                       // Aktueller Format-Wert
- 
- 
- static SwDBFieldType* In_SwDBFieldType( SwSwgReader& rPar )
-@@ -597,7 +597,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--                                       USHORT& rSubType, ULONG &rFmt,
-+                                       USHORT& rSubType, UINT32 &rFmt,
-                                        USHORT nVersion );
- 
- SwField* SwSwgReader::InField()
-
---- binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excvfbff.hxx	2006-11-22 10:13:33.000000000 +0100
-@@ -38,7 +38,7 @@
- #ifndef _SOLAR_H
- #include <tools/solar.h>
- #endif
--class String; 
-+class String;
- namespace binfilter {
- 
- 
-@@ -48,7 +48,7 @@
- #if defined(BLC) || defined(MAC)
- // BLC will es auf jeden Fall hier
- typedef void				( ValueFormBuffer::*Fkt_rString )( String & );
--typedef ULONG				( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+typedef sal_uInt32          ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
- class ValueFormBuffer
-@@ -57,13 +57,13 @@
- #if !defined(BLC) && !defined(MAC)
- // MSC will es auf jeden Fall hier
- 		typedef void		( ValueFormBuffer::*Fkt_rString )( String & );
--		typedef ULONG		( ValueFormBuffer::*Fkt_USHORT )( USHORT );
-+        typedef sal_uInt32  ( ValueFormBuffer::*Fkt_USHORT )( USHORT );
- #endif
- 
--		ULONG				*pHandles;		// Array mit Handles...
-+        sal_uInt32          *pHandles;      // Array mit Handles...
- 		USHORT				nMax;  			// Groesse des Arrays
- 		USHORT				nCount;			// Index des naechsten freien Eintrags
--		ULONG				nDefaultHandle;
-+        sal_uInt32          nDefaultHandle;
- 
- 		// nur fuer Excel5
- 		static const USHORT nAnzBuiltin;	// bekannte Formate
-@@ -76,11 +76,11 @@
- 		void				Init( void );
- 							// fuer 1. Nutzung
- 		void				__NewValueFormat( String &rFormString );
--		ULONG				__GetValueFormat( USHORT nExcIndex );
-+        sal_uInt32          __GetValueFormat( USHORT nExcIndex );
- 							// fuer n-te Nutzung
- 		void				_NewValueFormatX( String &rFormString );
- 		void				_NewValueFormat5( String &rFormString );
--		ULONG				_GetValueFormatX5( USHORT nExcIndex );
-+        sal_uInt32          _GetValueFormatX5( USHORT nExcIndex );
- 	public:
- 		ValueFormBuffer( const USHORT nSize = 2048 );
- 		~ValueFormBuffer();
-
---- binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/excxfbuf.hxx	2006-11-22 10:14:22.000000000 +0100
-@@ -208,7 +208,7 @@
- 		inline void		GetItemSets( USHORT nIndex, const SfxItemSet *pTxtAttr,
- 							const SfxItemSet *pBoxAttr );
- 
--		ULONG			GetNumFormat( USHORT nIndex );
-+		sal_uInt32		GetNumFormat( USHORT nIndex );
- 		void			SetItemSets( USHORT nCol, USHORT nSR, USHORT nER,
- 							USHORT nXF );
- #ifdef USED
-
---- binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/excel/sw_exctools.cxx	2006-11-22 10:13:33.000000000 +0100
-@@ -1167,7 +1167,7 @@
- 	}
- 
- // --------------------------------------------- XF_Buffer::GetNumFormat -
--UINT32 XF_Buffer::GetNumFormat( UINT16 nIndex )
-+sal_uInt32 XF_Buffer::GetNumFormat( UINT16 nIndex )
- 	{
- //	DBG_ASSERT( nIndex < nCount ,
- //		"+XF_Buffer::GetNumFormat(): das ist zuviel des Guten!" );
-
---- binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx	2006-11-22 10:22:51.000000000 +0100
-@@ -5001,7 +5001,7 @@
- }
- 
- extern void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
--										USHORT& rSubType, ULONG &rFmt,
-+										USHORT& rSubType, UINT32 &rFmt,
- 										USHORT nVersion );
- 
- BOOL Sw6Layout::InsertLine(SwDoc &rDoc,SwPaM &rPaM,String &rStg,BOOL bLast)
-@@ -5329,7 +5329,7 @@
- 					case 'U':
- 					{
- 						USHORT nSubType = TIMEFLD, nWhich = RES_DATETIMEFLD;
--						ULONG nFormat = (ULONG)TF_SSMM_24;
-+						UINT32 nFormat = (UINT32)TF_SSMM_24;
- 						sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
- 
-@@ -5351,7 +5351,7 @@
- 								case 'M':eDat=DF_LMONTH; break;
- 							}
- 							USHORT nSubType = DATEFLD, nWhich = RES_DATETIMEFLD;
--							ULONG nFormat = (ULONG)eDat;
-+							UINT32 nFormat = (UINT32)eDat;
- 
- 							sw3io_ConvertFromOldField( rDoc, nWhich, nSubType,
- 													nFormat, 0x0110 );
-
---- binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:11:30.000000000 +0100
-+++ binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx	2006-11-22 10:15:29.000000000 +0100
-@@ -1918,7 +1918,7 @@
- 		// tell the Formatter about the new entry
- 		UINT16 nCheckPos = 0;
- 		INT16  nType = NUMBERFORMAT_DEFINED;
--		ULONG  nKey;
-+		sal_uInt32  nKey;
- 
- 		pFormatter->PutandConvertEntry( *pFirst, nCheckPos, nType, nKey,
- 										LANGUAGE_GERMAN,
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i72236 b/editors/openoffice.org-vcltesttool/files/patch-i72236
deleted file mode 100644
index 3b4d0d4..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i72236
+++ /dev/null
@@ -1,11 +0,0 @@
---- svtools/source/items1/stylepool.cxx	2006-12-10 20:59:39.000000000 +0100
-+++ svtools/source/items1/stylepool.cxx	2006-12-10 20:59:57.000000000 +0100
-@@ -187,7 +187,7 @@
- 
- ::rtl::OUString StylePool::nameOf( SfxItemSet_Pointer_t pSet )
- {
--    return ::rtl::OUString::valueOf( reinterpret_cast<sal_Int32>( pSet.get() ), 16 );
-+    return ::rtl::OUString::valueOf( reinterpret_cast<sal_IntPtr>( pSet.get() ), 16 );
- }
- 
- // class StylePoolImpl organized a tree-structure where every node represents a SfxItemSet.
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i72372 b/editors/openoffice.org-vcltesttool/files/patch-i72372
deleted file mode 100644
index 081bc08..0000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i72372
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: shlib.cxx
-===================================================================
-RCS file: /cvs/udk/cppuhelper/source/shlib.cxx,v
-retrieving revision 1.25
-diff -u -r1.25 shlib.cxx
---- cppuhelper/source/shlib.cxx	1 Dec 2006 17:18:35 -0000	1.25
-+++ cppuhelper/source/shlib.cxx	8 Dec 2006 16:31:16 -0000
-@@ -311,7 +311,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -319,17 +318,6 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aGetFactoryName = OUSTR(COMPONENT_GETFACTORY);
-         pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
-         if (pSym != 0)
-@@ -337,59 +325,97 @@
-             OString aImplName(
-                 OUStringToOString( rImplName, RTL_TEXTENCODING_ASCII_US ) );
- 
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL &&aEnvTypeName.equalsAsciiL(
-+                 RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                XInterface * pRet =
-+                    (XInterface *) (*((component_getFactoryFunc) pSym))(
-+                        aImplName.getStr(), xMgr.get(), xKey.get() );
-+                if (pRet)
-+                {
-+                    xRet = pRet;
-+                    pRet->release();
-+                }
-+                else
-+                {
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": cannot get factory of demanded "
-+                                     "implementation: ");
-+                    aExcMsg += OStringToOUString(
-+                        aImplName, RTL_TEXTENCODING_ASCII_US );
-+                }
-+			}
-+			else
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				Mapping aEnv2Current( pEnv, pCurrentEnv );
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
- 
--				if (aCurrent2Env.is() && aEnv2Current.is())
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					
--					void * pSSF =
--						(*((component_getFactoryFunc) pSym))(
--							aImplName.getStr(), pSMgr, pKey );
--					
--					if (pKey)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--					}
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
--					}
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					Mapping aEnv2Current( pEnv, pCurrentEnv );
- 					
--					if (pSSF)
-+					if (aCurrent2Env.is() && aEnv2Current.is())
- 					{
--						aEnv2Current.mapInterface(
--							reinterpret_cast< void ** >( &xRet ),
--							pSSF, ::getCppuType( &xRet ) );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSSF );
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						
-+						void * pSSF =
-+							(*((component_getFactoryFunc) pSym))(
-+								aImplName.getStr(), pSMgr, pKey );
-+						
-+						if (pKey)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+						}
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
-+						}
-+						
-+						if (pSSF)
-+						{
-+							aEnv2Current.mapInterface(
-+								reinterpret_cast< void ** >( &xRet ),
-+								pSSF, ::getCppuType( &xRet ) );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSSF );
-+						}
-+						else
-+						{
-+							aExcMsg = aModulePath;
-+							aExcMsg += OUSTR(": cannot get factory of "
-+											 "demanded implementation: ");
-+							aExcMsg += OStringToOUString(
-+								aImplName, RTL_TEXTENCODING_ASCII_US );
-+						}
- 					}
- 					else
- 					{
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": cannot get factory of "
--										 "demanded implementation: ");
--						aExcMsg += OStringToOUString(
--							aImplName, RTL_TEXTENCODING_ASCII_US );
-+						aExcMsg =
-+							OUSTR("cannot get uno mappings: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg =
--						OUSTR("cannot get uno mappings: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -401,8 +427,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{
-@@ -463,7 +487,6 @@
-     pSym = osl_getFunctionSymbol( lib, aGetEnvName.pData );
-     if (pSym != 0)
-     {
--        uno_Environment * pCurrentEnv = 0;
-         uno_Environment * pEnv = 0;
- 
-         const sal_Char * pEnvTypeName = 0;
-@@ -471,65 +494,92 @@
-             &pEnvTypeName, &pEnv );
-         OUString aEnvTypeName( OUString::createFromAscii( pEnvTypeName ) );
- 
--		if (! pEnv)
--		{
--			uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
--		}
--		if (pEnv)
--		{
--			OUString aCppEnvTypeName =
--				OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
--			uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
--        }
--
-         OUString aWriteInfoName = OUSTR(COMPONENT_WRITEINFO);
-         pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
-         if (pSym != 0)
-         {
--			if (pEnv && pCurrentEnv)
-+			if (pEnv == NULL && aEnvTypeName.equalsAsciiL(
-+					RTL_CONSTASCII_STRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME)))
-+			{
-+                if (xKey.is())
-+                {
-+                    bRet = (*((component_writeInfoFunc) pSym))(
-+                        xMgr.get(), xKey.get() );
-+                    if (! bRet)
-+                    {
-+                        aExcMsg = aModulePath;
-+                        aExcMsg += OUSTR(": component_writeInfo() returned "
-+                                         "false!");
-+                    }
-+                }
-+                else
-+                {
-+                    // key is mandatory
-+                    aExcMsg = aModulePath;
-+                    aExcMsg += OUSTR(": registry is mandatory to invoke "
-+                                     "component_writeInfo()!");
-+                }
-+			}
-+			else 
- 			{
--				Mapping aCurrent2Env( pCurrentEnv, pEnv );
--				if (aCurrent2Env.is())
-+				if (!pEnv)
-+					uno_getEnvironment( &pEnv, aEnvTypeName.pData, 0 );
-+
-+				uno_Environment * pCurrentEnv = 0;
-+				if (pEnv)
- 				{
--					void * pSMgr = aCurrent2Env.mapInterface(
--						xMgr.get(), ::getCppuType( &xMgr ) );
--					void * pKey = aCurrent2Env.mapInterface(
--						xKey.get(), ::getCppuType( &xKey ) );
--					if (pKey)
-+					OUString aCppEnvTypeName =
-+						OUSTR(CPPU_CURRENT_LANGUAGE_BINDING_NAME);
-+					uno_getEnvironment( &pCurrentEnv, aCppEnvTypeName.pData, 0 );
-+				}
-+
-+				if (pEnv && pCurrentEnv)
-+				{
-+					Mapping aCurrent2Env( pCurrentEnv, pEnv );
-+					if (aCurrent2Env.is())
- 					{
--						bRet = (*((component_writeInfoFunc) pSym))(
--							pSMgr, pKey );
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pKey );
--						if (! bRet)
-+						void * pSMgr = aCurrent2Env.mapInterface(
-+							xMgr.get(), ::getCppuType( &xMgr ) );
-+						void * pKey = aCurrent2Env.mapInterface(
-+							xKey.get(), ::getCppuType( &xKey ) );
-+						if (pKey)
-+						{
-+							bRet = (*((component_writeInfoFunc) pSym))(
-+								pSMgr, pKey );
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pKey );
-+							if (! bRet)
-+							{
-+								aExcMsg = aModulePath;
-+								aExcMsg += OUSTR(": component_writeInfo() "
-+												 "returned false!");
-+							}
-+						}
-+						else
- 						{
-+							// key is mandatory
- 							aExcMsg = aModulePath;
--							aExcMsg += OUSTR(": component_writeInfo() "
--											 "returned false!");
-+							aExcMsg += OUSTR(": registry is mandatory to invoke"
-+											 " component_writeInfo()!");
-+						}
-+						
-+						if (pSMgr)
-+						{
-+							(*pEnv->pExtEnv->releaseInterface)(
-+								pEnv->pExtEnv, pSMgr );
- 						}
- 					}
- 					else
- 					{
--						// key is mandatory
--						aExcMsg = aModulePath;
--						aExcMsg += OUSTR(": registry is mandatory to invoke"
--										 " component_writeInfo()!");
--					}
--					
--					if (pSMgr)
--					{
--						(*pEnv->pExtEnv->releaseInterface)(
--							pEnv->pExtEnv, pSMgr );
-+						aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
- 					}
- 				}
- 				else
- 				{
--					aExcMsg = OUSTR("cannot get uno mapping: C++ <=> UNO!");
-+					aExcMsg = OUSTR("cannot get uno environments!");
- 				}
--			}
--			else
--			{
--				aExcMsg = OUSTR("cannot get uno environments!");
-+				if (pCurrentEnv)
-+					(*pCurrentEnv->release)( pCurrentEnv );
- 			}
-         }
-         else
-@@ -541,8 +591,6 @@
- 
-         if (pEnv)
-             (*pEnv->release)( pEnv );
--        if (pCurrentEnv)
--            (*pCurrentEnv->release)( pCurrentEnv );
-     }
- 	else
- 	{