Update to 2.0.3rc3

22 files changed, 8539 insertions, 1508 deletions

diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 5ab89c2156f6..626323760b84 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -27,7 +27,7 @@ EXTRACT_ONLY=	OOo_${OOOVERSION}_src.tar.gz
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
-OOOVERSION=	2.0.2
+OOOVERSION=	2.0.3rc3
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_VERSION=	1.7.5
@@ -45,30 +45,56 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 WITHOUT_CPU_CFLAGS=	true
 
-ONLY_FOR_ARCHS=	i386
+ONLY_FOR_ARCHS=	amd64 i386
+
+# XXX Cut & paste from bsd.port.mk.
+UNAME?=	/usr/bin/uname
+.if !defined(ARCH)
+ARCH!=  ${UNAME} -p
+.endif
+
+.if ${ARCH} == amd64
+BROKEN=	"Work in progress"
+.endif
 
 .if !defined(WITH_GNUGCJ)
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_BUILD=	jdk
+.if ${ARCH} == amd64
+JAVA_VENDOR=	bsdjava
+.else
 JAVA_VENDOR=	freebsd bsdjava
 .endif
+.endif
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
 
+.if ${ARCH} == amd64
+GCC_TARGET=		x86_64-portbld-freebsd${OSREL}
+FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
+.else
+GCC_TARGET=		${ARCH}-portbld-freebsd${OSREL}
+FREEBSD_ENV_SET=	FreeBSDIntelEnv.Set
+.endif
+
 .if ${PERL_LEVEL} < 500600
 IGNORE=		install lang/perl5.8 then try again
 .endif
 
 CODELINE=		680
 RELEASE_NR=		2.0
-OOOTAG?=		OOB680_m5
+OOOTAG?=		OOC680_m3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
 EXECBASE?=		openoffice.org-${OOOVERSION}
 DIST_SUBDIR=		openoffice.org2.0
 SIMPLEOSVER=		${OSREL:C/\.//g}
+.if ${ARCH} == amd64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64
+.else
 PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+.endif
 
 LOCALIZED_LANG?=	en-US
 # FIXME (Somehow INDEX build fails)
@@ -141,19 +167,17 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ENV+=      PATH="${WRKDIR}/gnugcj/bin:${PATH}"
 .endif
 
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL
 #workarounds
 CONFIGURE_ARGS+=	--with-system-xrender-headers=yes #i62713#
-
+CONFIGURE_ARGS+=	--with-system-freetype #link error with internal one
 .if (${OSVERSION} <= 492000)
 EXTRA_PATCHES+=	${FILESDIR}/fbsd4-workaroundpatch
 .endif
 .if defined(WITH_GNUGCJ)
-EXTRA_PATCHES+=	${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/gcj-fbsdworkaround
-.endif
-.if defined(WITHOUT_MOZILLA)
-EXTRA_PATCHES+=	${FILESDIR}/moz-patch_i59729 #cws pj50
+EXTRA_PATCHES+=	${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
 .endif
+
 #.if defined(WITH_TTF_BYTECODE_ENABLED)
 #EXTRA_PATCHES+=	 ${FILESDIR}/optpatch-freetype
 #.endif
@@ -203,17 +227,17 @@ do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 # PR:84786 #i53289#
 .if (${NUMOFPROCESSES}>1)
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
 .else
-	@cd ${WRKSRC} ;	${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${TCSH} -c "source ${FREEBSD_ENV_SET} ; dmake"
 .endif
 
 do-install:
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.tgz > ${WRKDIR}/INSTALLFILES
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.t?z > ${WRKDIR}/INSTALLFILES
 	@${RM} -Rf ${WRKDIR}/tmp
 	@${MKDIR} ${WRKDIR}/tmp
 	@for i in `${CAT} ${WRKDIR}/INSTALLFILES`; do \
-		${CP} ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
+		${CP} ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/$$i ${WRKDIR}/tmp ; \
 		cd ${WRKDIR}/tmp ; ${TAR} xfz ${WRKDIR}/tmp/$$i ; \
 	done
 	@${MKDIR} ${PREFIX}/${INSTALLATION_BASEDIR}
@@ -247,7 +271,6 @@ post-install:
 	@ln -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \
 			${PREFIX}/share/applnk/${EXECBASE}
 	@${PRINTF} "share/applnk/${EXECBASE}\n" >> ${TMPPLIST}
-.endif
 	@for dir in `ls ${ICONS}/hicolor | grep -v CVS`; do \
 		for app in base calc draw impress math printeradmin writer; do \
 			if [ -r ${ICONS}/hicolor/$${dir}/apps/$${app}.png ]; then \
@@ -262,6 +285,7 @@ post-install:
 			${PRINTF} "share/icons/hicolor/$${dir}/mimetypes/$${file}\n" >> ${TMPPLIST} ; \
 		done ; \
 	done
+.endif
 	@cd ${PREFIX} ; ${FIND} -s bin -type f | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s bin -type l | ${GREP} ${EXECBASE} >> ${TMPPLIST}
 	@cd ${PREFIX} ; ${FIND} -s ${INSTALLATION_BASEDIR} -type f >> ${TMPPLIST}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index 0383a403c129..bba1a93367c6 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 1b50c8c4c1002edbc4993060ca05ca8f
-SHA256 (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 82fc0e7d6aee6b55fce5c5b1c7e94394f7f60164f7c9ec1b2d7c6b562257ebad
-SIZE (openoffice.org2.0/OOo_2.0.2_src.tar.gz) = 293176001
+MD5 (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 4262b9d5b3acb91fcd3e7690096235bf
+SHA256 (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 238ff96190f5044723d3d2975ed76d25f9876a766a9387ff80483004f19d4ddf
+SIZE (openoffice.org2.0/OOo_2.0.3rc3_src.tar.gz) = 307311849
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index c4a0a84ac1c9..a81647fbd583 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -77,6 +77,7 @@ pre-fetch:
 #	@${ECHO} "make -DWITH_TTF_BYTECODE_ENABLED"
 #	@${ECHO} "See http://www.freetype.org/patents.html for details"
 #.endif
+.if !defined(LOCALIZED_LANG)
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
 	@${ECHO} "make LOCALIZED_LANG=xx" 
@@ -88,6 +89,7 @@ pre-fetch:
 	@${ECHO} "st sv sw sw-TZ sx ta-IN th tn tr ts ve vi xh zh-CN"
 	@${ECHO} "zh-TW zu"
 	@${ECHO} "Default: en-US"
+.endif
 .if !defined(WITH_GNUGCJ)
 	@${ECHO}
 	@${ECHO} "You can compile OOo with GNU GCJ instead of SUN's JDK with"
diff --git a/editors/openoffice.org-3-RC/files/Makefile.others b/editors/openoffice.org-3-RC/files/Makefile.others
index 0b5736d98822..444a91beac69 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.others
+++ b/editors/openoffice.org-3-RC/files/Makefile.others
@@ -16,7 +16,7 @@ package-rename:
 
 package-canonical:
 	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
-	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
+	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd-*/ ;\
 	${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
 
 sdk:
@@ -24,7 +24,7 @@ sdk:
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
@@ -35,7 +35,7 @@ ure:
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/URE/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/ure_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
@@ -48,9 +48,9 @@ solver:
 languagepack:
 	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
 .if defined (ALL_LOCALIZED_LANGS)
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
-	@cd ${WRKSRC} ; ${TCSH} -c 'source FreeBSDEnv.Set ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
+	@cd ${WRKSRC} ; ${TCSH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack_${LOCALIZED_LANG}'
 .endif
 
 .if !defined (ALL_LOCALIZED_LANGS)
@@ -58,7 +58,7 @@ languagepack:
 	@${MKDIR} ${WRKDIR}/langpack_tmp
 .if defined (LOCALIZED_LANG)
 	@cd ${WRKDIR}/langpack_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.tgz
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
 	@cd ${WRKDIR}/langpack_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \
diff --git a/editors/openoffice.org-3-RC/files/gcj-patches b/editors/openoffice.org-3-RC/files/cws-maho1.diff
index dbcbf5290d78..8362b1cdb171 100644
--- a/editors/openoffice.org-3-RC/files/gcj-patches
+++ b/editors/openoffice.org-3-RC/files/cws-maho1.diff
@@ -1,215 +1,11 @@
-http://www.openoffice.org/issues/show_bug.cgi?id=60091
---- solenv/inc/settings.mk.orig	2006-01-27 17:34:07.000000000 +0100
-+++ solenv/inc/settings.mk	2006-01-27 17:35:28.000000000 +0100
-@@ -186,12 +186,11 @@
- .ENDIF
- 
- #required arguments
--.IF "$(JAVACACHE)" != ""
--JAVAC=$(JAVACOMPILER) --encoding=ISO-8859-15 -O2 -fno-assert -Wno-deprecated -C
--JAVAI=$(JAVAINTERPRETER) -Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
--.ELSE
- JAVAC=$(JAVACOMPILER)
- JAVAI=$(JAVAINTERPRETER)
-+.IF "$(JAVACACHE)" != ""
-+JAVAC+=--encoding=UTF-8 -O2 -fno-assert -Wno-deprecated -C
-+JAVAI+=-Dgnu.gcj.precompiled.db.path=$(GCJ_DATABASE)
- .ENDIF
- 
- #classpath and response
-
-http://qa.openoffice.org/issues/show_bug.cgi?id=63070
-Index: wizards/com/sun/star/wizards/ui/FilterComponent.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/ui/FilterComponent.java,v
-retrieving revision 1.8
-diff -u -r1.8 FilterComponent.java
---- wizards/com/sun/star/wizards/ui/FilterComponent.java	28 Dec 2005 17:25:36 -0000	1.8
-+++ wizards/com/sun/star/wizards/ui/FilterComponent.java	27 Jan 2006 22:55:38 -0000
-@@ -261,10 +261,7 @@
- 								case DataType.BOOLEAN:
- 									double dblvalue = ((Double) curValue).doubleValue();
- 									curValue = new Boolean(dblvalue == 1.0);
--									/**TODO: 1) Datei SingleSelectQueryComposer modifizieren:
--									/ Zeilen 1525ff in Methode auslagern und Aufruf in Zeile 1356 ändern TypeConverter is parameter
--									 * 2) setDisplayCondition ändern
--									*/
-+									/* */
- 									break;
- 								default:
- 									curValue = String.valueOf(curValue);
-
-
-http://www.openoffice.org/issues/show_bug.cgi?id=61875
-Index: source/ui/slidesorter/cache/SlsQueueProcessor.hxx
-===================================================================
-RCS file: /cvs/graphics/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx,v
-retrieving revision 1.10
-diff -u -p -u -r1.10 SlsQueueProcessor.hxx
---- sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	19 Jan 2006 12:52:20 -0000	1.10
-+++ sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx	26 Jan 2006 08:29:38 -0000
-@@ -164,7 +164,7 @@ template <class Queue, class RequestData
-     while ( ! mrQueue.IsEmpty())
-     {
-         // Determine whether the system is idle.
--        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(mrView.GetWindow()));
-+        sal_Int32 nIdleState (tools::IdleDetection::GetIdleState(static_cast< ::Window* >(mrView.GetWindow())));
-         if (nIdleState != tools::IdleDetection::IDET_IDLE)
-         {
-             if ((nIdleState&tools::IdleDetection::IDET_FULL_SCREEN_SHOW_ACTIVE) != 0)
-
-#########
-cws maho1
-#########
-Index: config_office/configure
-===================================================================
-RCS file: /cvs/tools/config_office/configure,v
-retrieving revision 1.142
-retrieving revision 1.142.4.6
-diff -u -p -w -r1.142 -r1.142.4.6
---- config_office/configure	28 Feb 2006 16:55:27 -0000	1.142
-+++ config_office/configure	6 Mar 2006 23:20:24 -0000	1.142.4.6
-@@ -308,7 +308,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAR JAVACMD JAVA_HOME JDK XSLTPROC PERL DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS MOC KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -7250,9 +7250,14 @@ echo "$as_me: error: $javacompiler not f
- fi
- 
- if test "$SOLAR_JAVA" != ""; then
-+    if test "$JDK" = "gcj"; then
-+	javadoc_program=gjdoc
-+    else
-+	javadoc_program=javadoc
-+    fi
-     if test -z "$with_jdk_home"; then
--        # Extract the first word of "javadoc", so it can be a program name with args.
--set dummy javadoc; ac_word=$2
-+        # Extract the first word of "$javadoc_program", so it can be a program name with args.
-+set dummy $javadoc_program; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_JAVADOC+set}" = set; then
-@@ -7291,12 +7296,12 @@ echo "${ECHO_T}no" >&6
- fi
- 
-     else
--        _javadoc_path="$with_jdk_home/bin/javadoc"
-+        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
-                 if test -x "$_javadoc_path"; then
-             JAVADOC=$_javadoc_path
-         else
--            # Extract the first word of "javadoc", so it can be a program name with args.
--set dummy javadoc; ac_word=$2
-+            # Extract the first word of "$javadoc_program", so it can be a program name with args.
-+set dummy $javadoc_program; ac_word=$2
- echo "$as_me:$LINENO: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_JAVADOC+set}" = set; then
-@@ -7717,6 +7722,59 @@ echo "$as_me: WARNING: $javacache not fo
-    fi
- fi
- 
-+if test "$JDK" = "gcj"; then
-+   if test -x "$JAVA_HOME/bin/fastjar"; then
-+      JAR="$JAVA_HOME/bin/fastjar";
-+   else
-+      if test -x "$JAVA_HOME/bin/jar"; then
-+         JAR="$JAVA_HOME/bin/jar";
-+      else
-+         # Extract the first word of "jar", so it can be a program name with args.
-+set dummy jar; ac_word=$2
-+echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+if test "${ac_cv_path_JAR+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $JAR in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+    ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+
-+  ;;
-+esac
-+fi
-+JAR=$ac_cv_path_JAR
-+
-+if test -n "$JAR"; then
-+  echo "$as_me:$LINENO: result: $JAR" >&5
-+echo "${ECHO_T}$JAR" >&6
-+else
-+  echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+      fi
-+   fi
-+JAVACMD=$JAVAINTERPRETER
-+
-+
-+fi
-+
- 
- 
- 
-@@ -19533,9 +19591,8 @@ cat > conftest.xml << EOF
- 	</target>
-     </project>
- EOF
--  oldJAVA_HOME=$JAVA_HOME
-   if test "$JDK" = "gcj"; then
--    JAVA_HOME=; export JAVA_HOME
-+    JAVACMD="$JAVAINTERPRETER"; export JAVACMD
-     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
-   else
-     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
-@@ -19562,9 +19619,9 @@ echo "$as_me: WARNING: Ant does not work
-     ANT_HOME=""
-     echo "Ant does not work - Some Java projects will not build!" >>warn
-   fi
--  JAVA_HOME=$oldJAVA_HOME
-   rm -f conftest* core core.* *.core
- fi
-+
- if test -z "$ANT_HOME"; then
-    ANT_HOME="NO_ANT_HOME"
- fi
-@@ -20381,6 +20438,8 @@ s,@JAVACOMPILER@,$JAVACOMPILER,;t t
- s,@JAVADOC@,$JAVADOC,;t t
- s,@AWTLIB@,$AWTLIB,;t t
- s,@JAVACACHE@,$JAVACACHE,;t t
-+s,@JAR@,$JAR,;t t
-+s,@JAVACMD@,$JAVACMD,;t t
- s,@JAVA_HOME@,$JAVA_HOME,;t t
- s,@JDK@,$JDK,;t t
- s,@XSLTPROC@,$XSLTPROC,;t t
 Index: config_office/configure.in
 ===================================================================
 RCS file: /cvs/tools/config_office/configure.in,v
 retrieving revision 1.159
-retrieving revision 1.159.4.5
-diff -u -p -w -r1.159 -r1.159.4.5
+retrieving revision 1.159.4.6
+diff -u -p -r1.159 -r1.159.4.6
 --- config_office/configure.in	28 Feb 2006 16:41:29 -0000	1.159
-+++ config_office/configure.in	6 Mar 2006 23:20:25 -0000	1.159.4.5
++++ config_office/configure.in	7 Mar 2006 02:51:41 -0000	1.159.4.6
 @@ -2023,15 +2023,20 @@ dnl ====================================
  dnl Checks for javadoc
  dnl ===================================================================
@@ -266,7 +62,7 @@ diff -u -p -w -r1.159 -r1.159.4.5
 -  oldJAVA_HOME=$JAVA_HOME
    if test "$JDK" = "gcj"; then
 -    JAVA_HOME=; export JAVA_HOME
-+    JAVACMD="$JAVAINTERPRETER"; export JAVACMD
++    export JAVACMD
      ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
    else
      ant_cmd="$ANT -buildfile conftest.xml 1>&2"
@@ -286,7 +82,7 @@ Index: config_office/set_soenv.in
 RCS file: /cvs/tools/config_office/set_soenv.in,v
 retrieving revision 1.92
 retrieving revision 1.92.4.3
-diff -u -p -w -r1.92 -r1.92.4.3
+diff -u -p -r1.92 -r1.92.4.3
 --- config_office/set_soenv.in	28 Feb 2006 10:41:43 -0000	1.92
 +++ config_office/set_soenv.in	4 Mar 2006 08:04:38 -0000	1.92.4.3
 @@ -1696,6 +1696,8 @@ if ( '@JDK@' ne '' )
@@ -298,13 +94,13 @@ diff -u -p -w -r1.92 -r1.92.4.3
  }
  if ( $platform =~ m/darwin/ )
  {  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
-? berkeleydb/unxfbsd.pro
+
 Index: berkeleydb/makefile.mk
 ===================================================================
 RCS file: /cvs/external/berkeleydb/makefile.mk,v
 retrieving revision 1.30
 retrieving revision 1.30.6.2
-diff -u -p -w -r1.30 -r1.30.6.2
+diff -u -p -r1.30 -r1.30.6.2
 --- berkeleydb/makefile.mk	13 Jan 2006 16:23:55 -0000	1.30
 +++ berkeleydb/makefile.mk	4 Mar 2006 10:56:19 -0000	1.30.6.2
 @@ -86,6 +86,10 @@ CONFIGURE_ACTION= \
@@ -318,13 +114,12 @@ diff -u -p -w -r1.30 -r1.30.6.2
  .ENDIF
  
  BUILD_DIR=$(CONFIGURE_DIR)
-? qadevOOo/unxfbsd.pro
 Index: qadevOOo/runner/makefile.mk
 ===================================================================
 RCS file: /cvs/qa/qadevOOo/runner/makefile.mk,v
 retrieving revision 1.11
 retrieving revision 1.11.12.1
-diff -u -p -w -r1.11 -r1.11.12.1
+diff -u -p -r1.11 -r1.11.12.1
 --- qadevOOo/runner/makefile.mk	2 Nov 2005 17:40:11 -0000	1.11
 +++ qadevOOo/runner/makefile.mk	4 Mar 2006 04:49:22 -0000	1.11.12.1
 @@ -54,13 +54,17 @@ OWNJAR: ALLTAR
@@ -347,3 +142,144 @@ diff -u -p -w -r1.11 -r1.11.12.1
  
  .ELSE
  all:
+
+Index: config_office/configure
+===================================================================
+RCS file: /cvs/tools/config_office/configure,v
+retrieving revision 1.149
+diff -u -r1.149 configure
+--- config_office/configure	5 May 2006 11:32:59 -0000	1.149
++++ config_office/configure	9 May 2006 22:08:51 -0000
+@@ -309,7 +309,7 @@
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE GNUMAKE _cc PERL MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA LANG JAVAINTERPRETER JAVACOMPILER JAVADOC AWTLIB JAVACACHE JAR JAVACMD JAVA_HOME JDK XSLTPROC DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SYSTEM_XALAN XALAN_JAR SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF SYSTEM_NAS NAS_INCLUDES ENABLE_NAS ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON AGG_CFLAGS AGG_LIBS SYSTEM_AGG MYSPELL_CFLAGS MYSPELL_LIBS SYSTEM_MYSPELL SYSTEM_HUNSPELL HUNSPELL_CFLAGS SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS WITHOUT_PPDS WITHOUT_AFMS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+@@ -7705,9 +7705,14 @@
+ fi
+ 
+ if test "$SOLAR_JAVA" != ""; then
++    if test "$JDK" = "gcj"; then
++	javadoc_program=gjdoc
++    else
++	javadoc_program=javadoc
++    fi
+     if test -z "$with_jdk_home"; then
+-        # Extract the first word of "javadoc", so it can be a program name with args.
+-set dummy javadoc; ac_word=$2
++        # Extract the first word of "$javadoc_program", so it can be a program name with args.
++set dummy $javadoc_program; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_JAVADOC+set}" = set; then
+@@ -7746,12 +7751,12 @@
+ fi
+ 
+     else
+-        _javadoc_path="$with_jdk_home/bin/javadoc"
++        _javadoc_path="$with_jdk_home/bin/$javadoc_program"
+                 if test -x "$_javadoc_path"; then
+             JAVADOC=$_javadoc_path
+         else
+-            # Extract the first word of "javadoc", so it can be a program name with args.
+-set dummy javadoc; ac_word=$2
++            # Extract the first word of "$javadoc_program", so it can be a program name with args.
++set dummy $javadoc_program; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_JAVADOC+set}" = set; then
+@@ -8200,6 +8205,59 @@
+    fi
+ fi
+ 
++if test "$JDK" = "gcj"; then
++   if test -x "$JAVA_HOME/bin/fastjar"; then
++      JAR="$JAVA_HOME/bin/fastjar";
++   else
++      if test -x "$JAVA_HOME/bin/jar"; then
++         JAR="$JAVA_HOME/bin/jar";
++      else
++         # Extract the first word of "jar", so it can be a program name with args.
++set dummy jar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_path_JAR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $JAR in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_JAR="$JAR" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_JAR="$as_dir/$ac_word$ac_exec_ext"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  ;;
++esac
++fi
++JAR=$ac_cv_path_JAR
++
++if test -n "$JAR"; then
++  echo "$as_me:$LINENO: result: $JAR" >&5
++echo "${ECHO_T}$JAR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++      fi
++   fi
++JAVACMD=$JAVAINTERPRETER
++
++
++fi
++
+ 
+ 
+ 
+@@ -21115,9 +21173,8 @@
+ 	</target>
+     </project>
+ EOF
+-  oldJAVA_HOME=$JAVA_HOME
+   if test "$JDK" = "gcj"; then
+-    JAVA_HOME=; export JAVA_HOME
++    export JAVACMD
+     ant_cmd="$ANT -Dbuild.compiler=gcj -buildfile conftest.xml 1>&2"
+   else
+     ant_cmd="$ANT -buildfile conftest.xml 1>&2"
+@@ -21144,9 +21201,9 @@
+     ANT_HOME=""
+     echo "Ant does not work - Some Java projects will not build!" >>warn
+   fi
+-  JAVA_HOME=$oldJAVA_HOME
+   rm -f conftest* core core.* *.core
+ fi
++
+ if test -z "$ANT_HOME"; then
+    ANT_HOME="NO_ANT_HOME"
+ fi
+@@ -21963,6 +22020,8 @@
+ s,@JAVADOC@,$JAVADOC,;t t
+ s,@AWTLIB@,$AWTLIB,;t t
+ s,@JAVACACHE@,$JAVACACHE,;t t
++s,@JAR@,$JAR,;t t
++s,@JAVACMD@,$JAVACMD,;t t
+ s,@JAVA_HOME@,$JAVA_HOME,;t t
+ s,@JDK@,$JDK,;t t
+ s,@XSLTPROC@,$XSLTPROC,;t t
diff --git a/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi b/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi
deleted file mode 100644
index 405254ad39f6..000000000000
--- a/editors/openoffice.org-3-RC/files/gcj-cws_jaxpapi
+++ /dev/null
@@ -1,1067 +0,0 @@
-Index: external/prj/d.lst
-===================================================================
-RCS file: /cvs/util/external/prj/d.lst,v
-retrieving revision 1.21
-retrieving revision 1.21.18.1
-diff -u -r1.21 -r1.21.18.1
---- external/prj/d.lst	24 Nov 2004 15:13:13 -0000	1.21
-+++ external/prj/d.lst	17 Jan 2006 10:39:46 -0000	1.21.18.1
-@@ -24,8 +24,6 @@
- ..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\common.pro\bin\*.zip %_DEST%\pck%_EXT%\*.zip
- ..\common\xt.jar %_DEST%\bin%_EXT%\xt.jar
--..\common\jaxp.jar %_DEST%\bin%_EXT%\jaxp.jar
--..\common\parser.jar %_DEST%\bin%_EXT%\parser.jar
- 
- ..\audio\rtufiles\lib\audio\libaudio.a %_DEST%\lib%_EXT%\libaudio.a
- ..\audio\rtufiles\lib\audio\*.h %_DEST%\inc%_EXT%\audio\*
-Index: filter/source/config/tools/utils/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/tools/utils/makefile.mk,v
-retrieving revision 1.5
-retrieving revision 1.5.92.1
-diff -u -r1.5 -r1.5.92.1
---- filter/source/config/tools/utils/makefile.mk	8 Sep 2005 21:39:14 -0000	1.5
-+++ filter/source/config/tools/utils/makefile.mk	17 Jan 2006 11:03:44 -0000	1.5.92.1
-@@ -51,8 +51,8 @@
-                     juh.jar         \
-                     jut.jar         \
-                     java_uno.jar    \
--                    jaxp.jar        \
--                    parser.jar
-+                    xml-apis.jar    \
-+                    xercesImpl.jar
- 
- JAVACLASSFILES  =   \
-                     $(CLASSDIR)$/$(PACKAGE)$/AnalyzeStartupLog.class              \
-Index: helpcontent2/settings.pmk
-===================================================================
-RCS file: /cvs/documentation/helpcontent2/settings.pmk,v
-retrieving revision 1.5
-retrieving revision 1.5.106.1
-diff -u -r1.5 -r1.5.106.1
---- helpcontent2/settings.pmk	29 Apr 2005 09:14:07 -0000	1.5
-+++ helpcontent2/settings.pmk	17 Jan 2006 12:52:53 -0000	1.5.106.1
-@@ -1,5 +1,5 @@
- 
--my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
-+my_cp:=$(CLASSPATH)$(PATH_SEPERATOR)$(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/unoil.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/ridl.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jurt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/jut.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlsearch.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xmlhelp.jar
- 
- .IF "$(SYSTEM_DB)" == "YES"
- my_cp!:=$(my_cp)$(PATH_SEPERATOR)$(DB_JAR)
-Index: officecfg/org/openoffice/configuration/FileHelper.java
-===================================================================
-RCS file: /cvs/util/officecfg/org/openoffice/configuration/FileHelper.java,v
-retrieving revision 1.2
-retrieving revision 1.2.88.1
-diff -u -r1.2 -r1.2.88.1
---- officecfg/org/openoffice/configuration/FileHelper.java	8 Sep 2005 14:42:51 -0000	1.2
-+++ officecfg/org/openoffice/configuration/FileHelper.java	17 Jan 2006 11:28:49 -0000	1.2.88.1
-@@ -62,7 +62,7 @@
- 		File aFile = new File(sSource);
- 		
- 		try {
--			absPath = aFile.getAbsoluteFile().toURL().toString();
-+			absPath = aFile.getAbsolutePath();
- 		} catch (Exception e)
-         {
-             e.printStackTrace();            
-Index: officecfg/org/openoffice/configuration/Generator.java
-===================================================================
-RCS file: /cvs/util/officecfg/org/openoffice/configuration/Generator.java,v
-retrieving revision 1.2
-retrieving revision 1.2.902.1
-diff -u -r1.2 -r1.2.902.1
---- officecfg/org/openoffice/configuration/Generator.java	5 Jul 2001 08:04:36 -0000	1.2
-+++ officecfg/org/openoffice/configuration/Generator.java	17 Jan 2006 11:28:50 -0000	1.2.902.1
-@@ -18,7 +18,7 @@
-     public Generator() throws Exception
-     {
-         // set the driver for xt
--        System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser");
-+        System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser");
-     }    
- 
- 	/**
-Index: officecfg/org/openoffice/configuration/XMLDefaultGenerator.java
-===================================================================
-RCS file: /cvs/util/officecfg/org/openoffice/configuration/XMLDefaultGenerator.java,v
-retrieving revision 1.4
-retrieving revision 1.4.88.1
-diff -u -r1.4 -r1.4.88.1
---- officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	8 Sep 2005 14:43:34 -0000	1.4
-+++ officecfg/org/openoffice/configuration/XMLDefaultGenerator.java	17 Jan 2006 11:28:50 -0000	1.4.88.1
-@@ -36,12 +36,10 @@
- 
- import org.xml.sax.*;
- import org.w3c.dom.*;
--import com.sun.xml.tree.XmlDocument;
- import org.xml.sax.SAXException;
- import org.xml.sax.SAXParseException;
- import javax.xml.parsers.SAXParserFactory;
- import javax.xml.parsers.SAXParser;
--import com.sun.xml.tree.*;
- import java.util.*;
- import java.io.*;
- import com.jclark.xsl.sax.Driver;
-@@ -65,7 +63,7 @@
- 	public XMLDefaultGenerator(String sourceFile) throws Exception
-     {
-         // set the driver for xt
--        System.setProperty("com.jclark.xsl.sax.parser", "com.sun.xml.parser.Parser");
-+        System.setProperty("com.jclark.xsl.sax.parser", "org.apache.xerces.parsers.SAXParser");
-         evaluateSchema(sourceFile);
-     }
- 
-Index: readlicense_oo/util/makefile.pmk
-===================================================================
-RCS file: /cvs/installation/readlicense/util/makefile.pmk,v
-retrieving revision 1.10
-retrieving revision 1.10.12.1
-diff -u -r1.10 -r1.10.12.1
---- readlicense_oo/util/makefile.pmk	25 Oct 2005 10:43:44 -0000	1.10
-+++ readlicense_oo/util/makefile.pmk	17 Jan 2006 11:15:07 -0000	1.10.12.1
-@@ -70,7 +70,7 @@
- $(MISC)$/readme%.html :
-     @+-$(MKDIR) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=html file=$@
- .ELSE
- 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="html" doctype-public="-//W3C//DTD HTML 3.2//EN" />|' < ..$/readme.xsl | xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
-@@ -86,7 +86,7 @@
- $(MISC)$/readme%.txt :
-     @+-$(MKDIR) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $(subst,_$(@:b:s/_/./:e:s/.//), $(COMMONMISC)$/$(TARGET)$/$(@:b).xrm) ..$/readme.xsl os1=$(OS) gui1=$(GUI) cp1=$(CPUNAME) com1=$(COM) lang1=$(@:b:s/_/./:e:s/.//) type=text file=$@
- .ELSE
- 	sed 's|xmlns:xt="http://www.jclark.com/xt"||;s|extension-element-prefixes="xt"||;s|.*xt:document.*||;s|<xsl:output method = "HTML" doctype-public = "-//W3C//DTD HTML 3.2//EN" />|<xsl:output method="text" />|' < ..$/readme.xsl | xsltproc -o $@ \
- 	         --stringparam os1 $(OS) \
-Index: scripting/java/build.xml
-===================================================================
-RCS file: /cvs/framework/scripting/java/build.xml,v
-retrieving revision 1.32
-retrieving revision 1.32.18.1
-diff -u -r1.32 -r1.32.18.1
---- scripting/java/build.xml	9 Sep 2005 01:54:21 -0000	1.32
-+++ scripting/java/build.xml	17 Jan 2006 11:15:56 -0000	1.32.18.1
-@@ -65,15 +65,11 @@
- 
-   <path id="idesupport.class.path">
-     <pathelement path="${jardir}"/>
--    <!-- <pathelement path="${solar.jar}/jaxp.jar"/>
--    <pathelement path="${solar.jar}/parser.jar"/>
--    <pathelement path="${install.dir}/xerces.jar"/> -->
-   </path>
- 
-   <path id="openide.class.path">
-     <pathelement path="${jardir}"/>
-     <pathelement path="${solar.jar}/openide.jar"/>
--    <!-- <pathelement path="${install.dir}/xerces.jar"/> -->
-   </path>
-     
-   <path id="netbeans.editor.support.classpath">
-Index: solenv/bin/modules/installer/javainstaller.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/javainstaller.pm,v
-retrieving revision 1.22
-retrieving revision 1.21.184.2
-diff -u -r1.22 -r1.21.184.2
---- solenv/bin/modules/installer/javainstaller.pm	13 Jan 2006 15:01:29 -0000	1.22
-+++ solenv/bin/modules/installer/javainstaller.pm	18 Jan 2006 12:05:44 -0000	1.21.184.2
-@@ -494,14 +494,14 @@
- 
- 	# The variable CLASSPATH has to contain:
- 	# $installsdk/classes:$installsdk/classes/setupsdk.jar:
--	# $installsdk/classes/parser.jar:$installsdk/classes/jaxp.jar:
-+	# $installsdk/classes/xercesImpl.jar:$installsdk/classes/xml-apis.jar:
- 	# $installsdk/classes/ldapjdk.jar:$directory
- 	
- 	my @additional_classpath = ();
- 	push(@additional_classpath, "$installsdk\/classes");
- 	push(@additional_classpath, "$installsdk\/installsdk.jar");
--	push(@additional_classpath, "$installsdk\/classes\/parser.jar");
--	push(@additional_classpath, "$installsdk\/classes\/jaxp.jar");
-+	push(@additional_classpath, "$installsdk\/classes\/xml-apis.jar");
-+	push(@additional_classpath, "$installsdk\/classes\/xercesImpl.jar");
- 	push(@additional_classpath, "$directory");
- 
- 	my $newclasspathstring = "";
-Index: solenv/inc/tg_config.mk
-===================================================================
-RCS file: /cvs/tools/solenv/inc/tg_config.mk,v
-retrieving revision 1.6
-retrieving revision 1.6.184.1
-diff -u -r1.6 -r1.6.184.1
---- solenv/inc/tg_config.mk	8 Sep 2005 09:42:41 -0000	1.6
-+++ solenv/inc/tg_config.mk	17 Jan 2006 11:10:09 -0000	1.6.184.1
-@@ -62,12 +62,12 @@
- 	-$(MKDIRHIER) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
- .IF "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
- .ENDIF			# "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_val.xsl $(@:d)$*.val componentName=$(PACKAGE).$*
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/sanity.xsl $(@:d)$*.san 
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/schema_trim.xsl $(@:d)$*.tmp
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
- .ELSE
- # xsltproc already validates against the dtd.  For additional validation,
- # org.openoffice.configuration.Inspector should be replaced and the
-@@ -101,7 +101,7 @@
-     @+echo -------------+ creating locale dependent resource bundles
- 	-$(MKDIRHIER) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/resource.xsl $@ locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}
- .ELSE
- 	$(XSLTPROC) -o $@ \
- 	            --stringparam locale {$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))} \
-@@ -129,11 +129,11 @@
- 	-$(MKDIRHIER) $(@:d) 
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
- .IF "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.configuration.Inspector $<
- .ENDIF			# "$(NO_INSPECTION)"==""
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/data_val.xsl $(@:d)$*.val xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
- .ELSE
- # xsltproc already validates against the dtd.  For additional validation,
- # org.openoffice.configuration.Inspector should be replaced and the
-@@ -170,8 +170,8 @@
-     @+echo -------------+ creating locale dependent entries
- 	-$(MKDIRHIER) $(@:d)
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$*.tmp xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs schemaRoot=$(XCSROOT)$/registry$/schema locale={$(subst,$/$(PACKAGEDIR)$/$(@:f), $(subst,$(PROCESSOUT)$/registry$/res$/, $@))}	
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$*.tmp $@
- .ELSE
- 	$(XSLTPROC) -o $(@:d)$*.tmp \
- 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$*.xcs \
-@@ -206,8 +206,8 @@
-     @+echo -------------+ creating a module file
- 	-$(MKDIRHIER) $(@:d) 
- .IF "$(XSLTPROC)"=="NO_XSLTPROC"
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=com.sun.xml.parser.Parser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
--	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/jaxp.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/parser.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=com.sun.xml.parser.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xt.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/cfgimport.jar -Dcom.jclark.xsl.sax.parser=org.apache.xerces.parsers.SAXParser com.jclark.xsl.sax.Driver $< $(XSLDIR)$/alllang.xsl $(@:d)$(@:f:s/.xcu/.tmp/) xcs=$(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs schemaRoot=$(XCSROOT)$/registry$/schema module={$(subst,$(<:b)-, $(*))}
-+	$(JAVAI) $(JAVACPS) $(SOLARBINDIR)$/xml-apis.jar$(PATH_SEPERATOR)$(SOLARBINDIR)$/xercesImpl.jar$(PATH_SEPERATOR)$(PROCESSORDIR)$/schema.jar -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl org.openoffice.helper.PrettyPrinter $(@:d)$(@:f:s/.xcu/.tmp/) $@
- .ELSE
- 	$(XSLTPROC) -o $(@:d)$(@:f:s/.xcu/.tmp/) \
- 	            --stringparam xcs $(XCSROOT)$/registry$/schema$/$(PACKAGEDIR)$/$(<:b).xcs \
-Index: toolkit/test/accessibility/jawb.mf
-===================================================================
-RCS file: /cvs/gsl/toolkit/test/accessibility/jawb.mf,v
-retrieving revision 1.4
-retrieving revision 1.4.178.1
-diff -u -r1.4 -r1.4.178.1
---- toolkit/test/accessibility/jawb.mf	23 Jul 2004 14:26:57 -0000	1.4
-+++ toolkit/test/accessibility/jawb.mf	17 Jan 2006 11:03:18 -0000	1.4.178.1
-@@ -1,3 +1,3 @@
- Manifest-Version: 1.0
- Main-Class: AccessibilityWorkBench
--Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar jaxp.jar
-+Class-Path: classes.jar ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar xt.jar xml-apis.jar
-Index: xmerge/source/xmerge/build.xml
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
-retrieving revision 1.2
-retrieving revision 1.2.4.1
-diff -u -r1.2 -r1.2.4.1
---- xmerge/source/xmerge/build.xml	24 Oct 2005 17:57:33 -0000	1.2
-+++ xmerge/source/xmerge/build.xml	17 Jan 2006 10:54:44 -0000	1.2.4.1
-@@ -58,9 +58,8 @@
-     <property file="../inc/antbuild.properties"/>
-         
-     <path id="classpath">
--        <pathelement location="${solar.jar}/parser.jar"/>
--        <pathelement location="${solar.jar}/jaxp.jar"/>
--        <pathelement location="${solar.jar}/xerces.jar"/>    
-+        <pathelement location="${solar.jar}/xml-apis.jar"/>
-+        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
-         <pathelement location="${solar.jar}/unoil.jar"/>
-         <pathelement location="${solar.jar}/ridl.jar"/>
-         <pathelement location="${solar.jar}/jurt.jar"/>
-@@ -96,7 +95,7 @@
-                 <attribute name="Specification-Vendor" value="OpenOffice.org"/>
-                 <attribute name="Specification-Version" value="0.6.0"/>
-                 <attribute name="Implementation-Version" value="#IMPL-VERSION#"/>
--                <attribute name="Class-Path" value="jaxp.jar parser.jar"/>
-+                <attribute name="Class-Path" value="xml-apis.jar xercesImpl.jar"/>
-             </manifest>
-          </jar>
-     </target>
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java,v
-retrieving revision 1.3
-retrieving revision 1.2.4.1
-diff -u -r1.3 -r1.2.4.1
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml,v
-retrieving revision 1.2
-retrieving revision 1.2.4.1
-diff -u -r1.2 -r1.2.4.1
---- xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	24 Oct 2005 18:23:20 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/util/registry/build.xml	17 Jan 2006 10:55:00 -0000	1.2.4.1
-@@ -79,9 +79,8 @@
-     <!-- classpath settings for javac tasks -->
-     <path id="classpath">
-         <pathelement location="${build.class}"/>
--        <pathelement location="${solar.jar}/parser.jar"/>
--        <pathelement location="${solar.jar}/jaxp.jar"/>
--        <pathelement location="${solar.jar}/xerces.jar"/>
-+        <pathelement location="${solar.jar}/xml-apis.jar"/>
-+        <pathelement location="${solar.jar}/xercesImpl.jar"/>
-     </path>
- 
-     <!-- set whether we want to compile with or without deprecation -->
-Index: xmerge/util/build.xml
-===================================================================
-RCS file: /cvs/xml/xmerge/util/build.xml,v
-retrieving revision 1.9
-retrieving revision 1.9.4.1
-diff -u -r1.9 -r1.9.4.1
---- xmerge/util/build.xml	24 Oct 2005 18:23:52 -0000	1.9
-+++ xmerge/util/build.xml	17 Jan 2006 10:55:05 -0000	1.9.4.1
-@@ -39,9 +39,8 @@
-     <property name="javadoc.dir" location="${build.dir}/javadoc"/>
-     
-     <path id="classpath">
--        <pathelement location="${solar.jar}/parser.jar"/>
--        <pathelement location="${solar.jar}/jaxp.jar"/>
--        <pathelement location="${solar.jar}/xerces.jar"/>    
-+        <pathelement location="${solar.jar}/xml-apis.jar"/>
-+        <pathelement location="${solar.jar}/xercesImpl.jar"/>    
-         <pathelement location="${solar.jar}/unoil.jar"/>
-         <pathelement location="${solar.jar}/ridl.jar"/>
-         <pathelement location="${solar.jar}/jurt.jar"/>
-Index: xmerge/util/xmerge.mf
-===================================================================
-RCS file: /cvs/xml/xmerge/util/xmerge.mf,v
-retrieving revision 1.1
-retrieving revision 1.1.24.1
-diff -u -r1.1 -r1.1.24.1
---- xmerge/util/xmerge.mf	7 Mar 2002 16:45:23 -0000	1.1
-+++ xmerge/util/xmerge.mf	17 Jan 2006 10:55:11 -0000	1.1.24.1
-@@ -1,6 +1,6 @@
- Manifest-Version: 1.0
- Main-Class: org.openoffice.xmerge.test.Driver
--Class-Path: jaxp.jar parser.jar
-+Class-Path: xml-apis.jar xercesImpl.jar
- Specification-Title: OpenOffice XMerge Framework
- Specification-Vendor: OpenOffice.org
- Specification-Version: 0.6.0
-Index: xmerge/workben/build.xml
-===================================================================
-RCS file: /cvs/xml/xmerge/workben/build.xml,v
-retrieving revision 1.3
-retrieving revision 1.3.8.1
-diff -u -r1.3 -r1.3.8.1
---- xmerge/workben/build.xml	9 Sep 2005 11:50:54 -0000	1.3
-+++ xmerge/workben/build.xml	17 Jan 2006 10:55:13 -0000	1.3.8.1
-@@ -60,9 +60,8 @@
-     <!-- classpath settings for javac tasks -->
-     <path id="classpath">
-         <pathelement location="${build.class}"/>
--        <pathelement location="${solar.jar}/parser.jar"/>
--        <pathelement location="${solar.jar}/jaxp.jar"/>
--        <pathelement location="${solar.jar}/xerces.jar"/>
-+        <pathelement location="${solar.jar}/xml-apis.jar"/>
-+        <pathelement location="${solar.jar}/xercesImpl.jar"/>
-     </path>
- 
-     <!-- set wether we want to compile with or without deprecation -->
-Index: xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java,v
-retrieving revision 1.2
-retrieving revision 1.2.2.1
-diff -u -r1.2 -r1.2.2.1
---- xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	16 Jan 2006 12:35:17 -0000	1.2
-+++ xmlhelp/source/com/sun/star/help/GCJFileURLStreamHandler.java	19 Jan 2006 09:43:59 -0000	1.2.2.1
-@@ -43,12 +43,12 @@
- import java.net.URLConnection;
- import java.util.HashMap;
- 
--public class FileURLStreamHandler
-+public class GCJFileURLStreamHandler
- 	extends gnu.java.net.protocol.file.Handler {
- 
- 	private static HashMap cache = new HashMap();
- 
--	FileURLStreamHandler() {
-+	GCJFileURLStreamHandler() {
- 	}
- 
- 	public URLConnection openConnection(URL url) throws IOException {
-Index: xmlhelp/source/com/sun/star/help/HelpCompiler.java
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpCompiler.java,v
-retrieving revision 1.12
-retrieving revision 1.11.4.2
-diff -u -r1.12 -r1.11.4.2
---- xmlhelp/source/com/sun/star/help/HelpCompiler.java	16 Jan 2006 12:35:49 -0000	1.12
-+++ xmlhelp/source/com/sun/star/help/HelpCompiler.java	18 Jan 2006 12:08:35 -0000	1.11.4.2
-@@ -38,6 +38,7 @@
- import java.io.ByteArrayInputStream;
- import java.io.File;
- import java.io.IOException;
-+import java.io.ByteArrayOutputStream;
- import java.io.InputStreamReader;
- import java.io.UnsupportedEncodingException;
- import java.net.MalformedURLException;
-@@ -49,16 +50,20 @@
- import java.util.LinkedList;
- import java.util.List;
- 
-+import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory;
-+
- import org.w3c.dom.Document;
- import org.w3c.dom.Element;
- import org.w3c.dom.Node;
- import org.w3c.dom.NodeList;
- import org.w3c.dom.Text;
-+import org.w3c.dom.traversal.DocumentTraversal;
-+import org.w3c.dom.traversal.NodeFilter;
-+import org.w3c.dom.traversal.TreeWalker;
-+import org.w3c.dom.traversal.NodeIterator;
- import org.xml.sax.InputSource;
- 
--import com.sun.xml.tree.TreeWalker;
--import com.sun.xml.tree.XmlDocument;
--
- public class HelpCompiler {
- 
- 	private static final String makeRelPrefix = ".." + File.separator;
-@@ -98,25 +103,25 @@
- 
- 	}
- 
--	private Object[] switchFind(Node node) {
-+	private Object[] switchFind(Document doc) {
- 		HashSet hs = new HashSet();
--		Node next;
--		TreeWalker tw = new TreeWalker(node);
--		while ((next = tw.getNextElement("switchinline")) != null) {
--			Element el = (Element) next;
--			if (!el.getAttribute("select").equals("appl"))
--				continue;
--
--			NodeList nl = el.getChildNodes();
--			for (int i = 0; i < nl.getLength(); ++i) {
--				if (nl.item(i).getNodeName().equals("caseinline")) {
--					String appl = ((Element) nl.item(i)).getAttribute("select");
--					hs.add(appl);
--				} else if (nl.item(i).getNodeName().equals("defaultinline")) {
--					hs.add("DEFAULT");
--				}
--			}
--		}
-+
-+                NodeList nodelist = doc.getElementsByTagName("switchinline");
-+
-+		for (int j = 0; j < nodelist.getLength(); ++j) {
-+			Element el = (Element) nodelist.item(j);
-+			if (el.getAttribute("select").equals("appl")) {
-+				NodeList nl = el.getChildNodes();
-+                       		for (int i = 0; i < nl.getLength(); ++i) {
-+                               		if (nl.item(i).getNodeName().equals("caseinline")) {
-+                                       		String appl = ((Element) nl.item(i)).getAttribute("select");
-+                                       		hs.add(appl);
-+                               		} else if (nl.item(i).getNodeName().equals("defaultinline")) {
-+                                       		hs.add("DEFAULT");
-+					}
-+                               	}
-+                	}
-+                }
- 
- 		hs.add("DEFAULT");
- 		return hs.toArray();
-@@ -129,6 +134,9 @@
- 		NodeList nl = node.getChildNodes();
- 		for (int i = 0; i < nl.getLength(); ++i) {
- 			Node n = nl.item(i);
-+                        if (n == null) {
-+                                continue;
-+                        }
- 			if ((n.getNodeName().equals("switchinline")
- 				|| n.getNodeName().equals("switch"))
- 				&& ((Element) n).getAttribute("select").equals("appl")) {
-@@ -168,93 +176,119 @@
- 		return parent;
- 	}
- 
--	public boolean compile() throws UnsupportedEncodingException {
--		// we now have the jaroutputstream, which will contain the document.
--		// now determine the document as a dom tree in variable docResolved
--		File inputFil = new File(inputFile);
--        
--        // HelpCompiler.getSourceDocument() takes a string that resembles an URL. 
--        // Using inputFil.toURL() is way to expensive here, 
--        // because it checks the filesystem to find out if inputFil
--        // might be a directory. This takes a lot of time if working from
--        // Windows via NFS on remote volumes. We "know" that inputfil is
--        // a file anyway.
--        String path;
--        if ( File.separatorChar == '\\' ) {
--            path = "file:/";
--            path += inputFil.getAbsolutePath();
--            path = path.replace('\\','/');
-+	static byte[] docToBytes(Document doc) throws IOException {
-+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-+
-+		java.lang.reflect.Constructor con;
-+		java.lang.reflect.Method meth;
-+		String domImpl = doc.getClass().getName();
-+
-+        /*
-+         * We may have multiple XML parsers in the Classpath.
-+         * Depending on which one is first, the actual type of
-+         * doc may vary.  Need a way to find out which API is being
-+         * used and use an appropriate serialization method.
-+         */
-+        try {
-+            // First of all try for JAXP 1.0
-+            if (domImpl.equals("com.sun.xml.tree.XmlDocument")) {
-+                Class jaxpDoc = Class.forName("com.sun.xml.tree.XmlDocument");
-+
-+                // The method is in the XMLDocument class itself, not a helper
-+                meth = jaxpDoc.getMethod("write",
-+                            new Class[] { Class.forName("java.io.OutputStream") } );
-+
-+                meth.invoke(doc, new Object [] { baos } );
-+         }
-+         else if (domImpl.equals("org.apache.crimson.tree.XmlDocument")) {
-+                       Class crimsonDoc = Class.forName("org.apache.crimson.tree.XmlDocument");
-+                       // The method is in the XMLDocument class itself, not a helper
-+                meth = crimsonDoc.getMethod("write",
-+                            new Class[] { Class.forName("java.io.OutputStream") } );
-+
-+                meth.invoke(doc, new Object [] { baos } );
-+         }
-+         else if (domImpl.equals("gnu.xml.dom.DomDocument")) {
-+                Class gnuSer = Class.forName("gnu.xml.dom.ls.DomLSSerializer");
-+
-+                // Get the serialize method
-+                meth = gnuSer.getMethod("serialize",
-+                            new Class [] { Class.forName("org.w3c.dom.Node"),
-+                                                       Class.forName("java.io.OutputStream") } );
-+
-+                // Get an instance
-+                               Object serializer = gnuSer.newInstance();
-+
-+                // Now call serialize to write the document
-+                meth.invoke(serializer, new Object [] { doc, baos } );
-+         }
-+         else if (domImpl.equals("org.apache.xerces.dom.DocumentImpl")
-+            || domImpl.equals("org.apache.xerces.dom.DeferredDocumentImpl")) {
-+                // Try for Xerces
-+                Class xercesSer =
-+                        Class.forName("org.apache.xml.serialize.XMLSerializer");
-+
-+                // Get the OutputStream constructor
-+                // May want to use the OutputFormat parameter at some stage too
-+                con = xercesSer.getConstructor(new Class []
-+                        { Class.forName("java.io.OutputStream"),
-+                          Class.forName("org.apache.xml.serialize.OutputFormat") } );
-+
-+
-+                // Get the serialize method
-+                meth = xercesSer.getMethod("serialize",
-+                            new Class [] { Class.forName("org.w3c.dom.Document") } );
-+
-+
-+                // Get an instance
-+                Object serializer = con.newInstance(new Object [] { baos, null } );
-+
-+
-+                // Now call serialize to write the document
-+                meth.invoke(serializer, new Object [] { doc } );
-+            }
-+            else {
-+                // We don't have another parser
-+                throw new IOException("No appropriate API (JAXP/Xerces) to serialize XML document: " + domImpl);
-+            }
-         }
--        else {
--            path = "file:" + inputFil.getAbsolutePath();
-+        catch (ClassNotFoundException cnfe) {
-+            throw new IOException(cnfe.toString());
-+        }
-+        catch (Exception e) {
-+            // We may get some other errors, but the bottom line is that
-+            // the steps being executed no longer work
-+            throw new IOException(e.toString());
-         }
--		byte[] embResolved = getSourceDocument(path);
- 
--		// now add path to the document
--		// resolve the dom
--		if (embResolved == null) {
--            String sourcePath;
--    		try {
--	    		sourcePath = inputFil.getCanonicalPath();
--    		} catch (IOException e3) {
--    			sourcePath = inputFil.getAbsolutePath();
--	    	}
--			System.err.println("ERROR: file not existing: " + sourcePath);
--			System.exit(1);
--		}
-+        byte bytes[] = baos.toByteArray();
- 
--		ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
--		InputStreamReader inread;
--		try {
--			inread = new InputStreamReader(inByte, "UTF8");
--		} catch (UnsupportedEncodingException e) {
--			System.err.println(
--				"ERROR: unsupported Encoding '"
--					+ inputFile
--					+ "': "
--					+ e.getMessage());
--			return false;
--		}
-+        return bytes;
-+    }
- 
--		InputSource inputSource = new InputSource(inread);
--		inputSource.setEncoding("UTF8");
--		Document docResolvedOrg = null;
--		try {
--			docResolvedOrg = XmlDocument.createXmlDocument(inputSource, false);
--		} catch (Exception e) {
--			System.err.println(
--				"ERROR: XmlDocument.createXmlDocument() failed for '"
--					+ inputFile
--					+ "': "
--					+ e.getMessage());
--			return false;
--		}
-+    public class myparser {
-+    	HashSet hidlist = null;
-+        HashSet extendedHelpText = null;
-+        Hashtable keywords = null;
-+        Hashtable helptexts = null;
-+        String documentId = null;
-+        String fileName = null;
-+        String title = null;
-+
-+        public myparser(String indocumentId, String infileName, String intitle) {
-+            hidlist = new HashSet();
-+            extendedHelpText = new HashSet();
-+            keywords = new Hashtable();
-+            helptexts = new Hashtable();
-+            documentId = indocumentId;
-+            fileName = infileName;
-+        	title = intitle;
-+        }
- 
--		// now find all applications for which one has to compile
--		String documentId = null;
--		String fileName = null;
--		String title = null;
--		// returns all applications for which one has to compile
--		Object[] applications = switchFind(docResolvedOrg);
--        
--        for (int i = 0; i < applications.length; ++i) {
--			String appl = (String) applications[i];
--            // returns a clone of the document with swich-cases resolved
--			Element docResolved =
--				(Element) clone(docResolvedOrg.getDocumentElement(), appl);
--			// now determine the id of the document, which is part of the
--			// bookmark - tag (HID)
--			Node test;
--			TreeWalker treewalker = new TreeWalker(docResolved);
--			// a number to determine the anchor of the whole stuff
--			HashSet hidlist = new HashSet();
--			HashSet extendedHelpText = new HashSet();
--			Hashtable keywords = new Hashtable();
--			Hashtable helptexts = new Hashtable();
--            
--			while ((test = treewalker.getNext()) != null) {
--				if (fileName == null
--					&& test.getNodeName().equals("filename")) {
-+        public void traverse( Node parentNode ) {
-+            // traverse all nodes that belong to the parent
-+			for(Node test=parentNode.getFirstChild(); test!=null; test=test.getNextSibling()) {
-+				if (fileName == null && test.getNodeName().equals("filename")) {
- 					NodeList list = test.getChildNodes();
- 					Node node = list.item(0);
- 					if (node.getNodeType() == Node.TEXT_NODE)
-@@ -332,15 +366,102 @@
- 					if (!extendedHelpText.isEmpty())
- 						extendedHelpText = new HashSet();
- 				}
--			} // now save the info
-+                  // traverse children
-+                  traverse(test);
-+                }
-+          }
-+    }
-+
-+    public boolean compile() throws UnsupportedEncodingException, java.io.IOException {
-+           // we now have the jaroutputstream, which will contain the document.
-+           // now determine the document as a dom tree in variable docResolved
-+           String absolutePath;
-+           String sourcePath;
-+           File inputFil = new File(inputFile);
-+           try {
-+                   absolutePath = inputFil.getCanonicalPath();
-+           } catch (IOException e3) {
-+                   absolutePath = inputFil.getAbsolutePath();
-+           }
-+           try {
-+                   sourcePath = new File(src).getCanonicalPath();
-+           } catch (IOException e3) {
-+                   sourcePath = new File(inputFile).getAbsolutePath();
-+           }
-+
-+           byte[] embResolved = null;
-+           try {
-+                   embResolved = getSourceDocument(inputFil.toURL().toExternalForm());
-+           } catch (MalformedURLException e4) {
-+                   System.err.println(
-+                           "ERROR: malformed URL '" + inputFile + "': " + e4.getMessage());
-+                   return false;
-+           }
-+
-+           // now add path to the document
-+           // resolve the dom
-+           if (embResolved == null) {
-+                   System.err.println("ERROR: file not existing: " + sourcePath);
-+                   System.exit(1);
-+           }
-+
-+           ByteArrayInputStream inByte = new ByteArrayInputStream(embResolved);
-+           InputStreamReader inread;
-+           try {
-+                   inread = new InputStreamReader(inByte, "UTF8");
-+           } catch (UnsupportedEncodingException e) {
-+                   System.err.println(
-+                           "ERROR: unsupported Encoding '"
-+                                   + inputFile
-+                                   + "': "
-+                                   + e.getMessage());
-+                   return false;
-+		   }
-+
-+           InputSource inputSource = new InputSource(inread);
-+           inputSource.setEncoding("UTF8");
-+           Document docResolvedOrg = null;
-+           try {
-+                   //System.err.println("Compiling " + inputFile);
-+                   DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+                   dFactory.setValidating(false);
-+                   DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+                   docResolvedOrg = dBuilder.parse(inputSource);
-+           } catch (Exception e) {
-+                   System.err.println(
-+                           "ERROR: XmlDocument.createXmlDocument() failed for '"
-+                                   + inputFile
-+                                   + "': "
-+                                   + e.getMessage());
-+                   return false;
-+           }
-+
-+           // now find all applications for which one has to compile
-+           String documentId = null;
-+           String fileName = null;
-+           String title = null;
-+           // returns all applications for which one has to compile
-+           Object[] applications = switchFind(docResolvedOrg);
-+
-+		   for (int i = 0; i < applications.length; ++i) {
-+               String appl = (String) applications[i];
-+               // returns a clone of the document with swich-cases resolved
-+               Element docResolved =
-+                       (Element) clone(docResolvedOrg.getDocumentElement(), appl);
-+
-+               myparser aparser = new myparser(documentId, fileName, title);
-+               aparser.traverse(docResolved);
-+               documentId = aparser.documentId;
-+               fileName = aparser.fileName;
-+               title = aparser.title;
- 
- 			addEntryToJarFile(
- 				appl,
- 				"text",
--				docResolved.toString().getBytes("UTF8"));
--			addEntryToJarFile(appl, "hidlist", hidlist);
--			addEntryToJarFile(appl, "helptexts", helptexts);
--			addEntryToJarFile(appl, "keywords", keywords);
-+                docToBytes(docResolved.getOwnerDocument()));
-+            addEntryToJarFile(appl, "hidlist", aparser.hidlist);
-+            addEntryToJarFile(appl, "helptexts", aparser.helptexts);
-+            addEntryToJarFile(appl, "keywords", aparser.keywords);
- 		} // end iteration over all applications
- 
- 		try {
-Index: xmlhelp/source/com/sun/star/help/HelpIndexer.java
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/HelpIndexer.java,v
-retrieving revision 1.16
-retrieving revision 1.16.20.1
-diff -u -r1.16 -r1.16.20.1
---- xmlhelp/source/com/sun/star/help/HelpIndexer.java	25 Oct 2005 11:24:55 -0000	1.16
-+++ xmlhelp/source/com/sun/star/help/HelpIndexer.java	17 Jan 2006 11:20:47 -0000	1.16.20.1
-@@ -46,7 +46,6 @@
- import java.util.*;
- 
- import org.w3c.dom.*;
--import com.sun.xml.tree.*;
- import org.xml.sax.*;
- import javax.xml.parsers.*;
- import com.jclark.xsl.sax.*;
-@@ -246,7 +245,10 @@
- 					in.setEncoding("UTF8");
- 					Document docResolved = null;
- 					try {
--						docResolved = XmlDocument.createXmlDocument(in, false);
-+						DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+						dFactory.setValidating(false);
-+						DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+						docResolved = dBuilder.parse(in);
- 					} catch (Exception e) {
- 						if (docResolved == null)
- 							System.err.println("Nullpointer");
-Index: xmlhelp/source/com/sun/star/help/makefile.mk
-===================================================================
-RCS file: /cvs/util/xmlhelp/source/com/sun/star/help/makefile.mk,v
-retrieving revision 1.21
-retrieving revision 1.21.2.1
-diff -u -r1.21 -r1.21.2.1
---- xmlhelp/source/com/sun/star/help/makefile.mk	16 Jan 2006 12:42:15 -0000	1.21
-+++ xmlhelp/source/com/sun/star/help/makefile.mk	19 Jan 2006 14:48:36 -0000	1.21.2.1
-@@ -42,7 +42,7 @@
- 
- .INCLUDE : settings.mk
- 
--JARFILES 		= jaxp.jar parser.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
-+JARFILES 		= xml-apis.jar xercesImpl.jar xt.jar unoil.jar ridl.jar jurt.jar jut.jar xmlsearch.jar
- EXTRAJARFILES 	= 
- 
- .IF "$(SYSTEM_DB)" == "YES"
-Index: XmlSearch/src/com/sun/xmlsearch/makefile.mk
-===================================================================
-RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/makefile.mk,v
-retrieving revision 1.5
-retrieving revision 1.5.6.1
-diff -u -r1.5 -r1.5.6.1
---- XmlSearch/src/com/sun/xmlsearch/makefile.mk	25 Oct 2005 11:11:58 -0000	1.5
-+++ XmlSearch/src/com/sun/xmlsearch/makefile.mk	17 Jan 2006 10:54:03 -0000	1.5.6.1
-@@ -3,9 +3,9 @@
- #*    $Workfile:$
- #*
- #*    Creation date     KR 28.06.99
--#*    last change       $Author: hr $ $Date: 2005/10/25 11:11:58 $
-+#*    last change       $Author: cmc $ $Date: 2006/01/17 10:54:03 $
- #*
--#*    $Revision: 1.5 $
-+#*    $Revision: 1.5.6.1 $
- #*
- #*    $Logfile:$
- #*
-@@ -21,8 +21,7 @@
- 
- .INCLUDE : settings.mk
- 
--JARFILES 		=  jaxp.jar parser.jar xt.jar
--#EXTRAJARFILES 		=  jaxp.jar parser.jar xt.jar  
-+JARFILES 		=  xpi-apis.jar xercesImpl.jar xt.jar
- 
- JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
- 
-Index: XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java
-===================================================================
-RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java,v
-retrieving revision 1.2
-retrieving revision 1.2.12.1
-diff -u -r1.2 -r1.2.12.1
---- XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	9 Sep 2005 16:41:49 -0000	1.2
-+++ XmlSearch/src/com/sun/xmlsearch/tree/TreeBuilder.java	17 Jan 2006 10:54:04 -0000	1.2.12.1
-@@ -46,7 +46,8 @@
- import org.xml.sax.HandlerBase;
- import org.xml.sax.AttributeList;
- import org.xml.sax.InputSource;
--import com.sun.xml.parser.Parser;
-+import javax.xml.parsers.SAXParserFactory;
-+import javax.xml.parsers.SAXParser;
- import com.sun.xmlsearch.util.IntegerArray;
- import com.jclark.xsl.om.*;
- 
-@@ -610,22 +611,29 @@
- 		}
-     } // end of SubstitutedElement
- 
-+    private SAXParser getParser() throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException
-+    {
-+        SAXParserFactory spf = SAXParserFactory.newInstance();
-+        spf.setValidating(false);
-+        return spf.newSAXParser();
-+    }
-+
-     private static final int InitStackSize = 256;
-     private static final Name EmptyName = null;
--    private Parser _parser = new Parser();
-+    private SAXParser _parser = null;
-     private Hashtable _names = new Hashtable(256);
-   
-     private NameTable _nameTable;
-     private NamespacePrefixMap _nsMap;
-   
--    public TreeBuilder() {
-+    public TreeBuilder() throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException {
- 		this(new NameTableImpl());
-     }
- 
--    public TreeBuilder(NameTable nameTable) {
-+    public TreeBuilder(NameTable nameTable) throws org.xml.sax.SAXException, javax.xml.parsers.ParserConfigurationException {
-+		_parser = getParser();
- 		_nameTable = nameTable;
- 		_nsMap = _nameTable.getEmptyNamespacePrefixMap();
--		_parser.setFastStandalone(true);
-     }
- 
-     public Node makeSubstituteElement(Name name, Node2[] children, Node original) {
-@@ -917,9 +925,8 @@
-     
-     public synchronized Node getRoot(InputSource input) {
- 		try {
--			_parser.setDocumentHandler(this);
- 			// long start = System.currentTimeMillis();
--			_parser.parse(input);
-+			_parser.parse(input, this);
- 			/*
- 			  System.out.println((System.currentTimeMillis()-start)
- 			  +" msec parse");
-Index: XmlSearch/src/com/sun/xmlsearch/util/Configuration.java
-===================================================================
-RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/util/Configuration.java,v
-retrieving revision 1.2
-retrieving revision 1.2.12.1
-diff -u -r1.2 -r1.2.12.1
---- XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	9 Sep 2005 16:45:09 -0000	1.2
-+++ XmlSearch/src/com/sun/xmlsearch/util/Configuration.java	17 Jan 2006 10:54:05 -0000	1.2.12.1
-@@ -40,8 +40,8 @@
- import java.util.Vector;
- import java.net.URL;
- import org.w3c.dom.*;
--import com.sun.xml.tree.XmlDocument;
--import com.sun.xml.parser.Resolver;
-+import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory; 
- import org.xml.sax.InputSource;
- 
- public final class Configuration {
-@@ -68,14 +68,19 @@
-     }
- 
-     public static Element parse(URL location) throws Exception {
--	InputSource input = Resolver.createInputSource(location, true);
--	XmlDocument document = XmlDocument.createXmlDocument(input, false);
-+	DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+        dFactory.setValidating(false);
-+        DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+        Document document = dBuilder.parse(location.openStream());
- 	return document.getDocumentElement();
-     }
- 
-     public static Element parse(byte[] xmlBytes) throws Exception {
- 	ByteArrayInputStream input = new ByteArrayInputStream(xmlBytes);
--	XmlDocument document = XmlDocument.createXmlDocument(input, false);
-+        DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+        dFactory.setValidating(false);
-+        DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+        Document document = dBuilder.parse(input);
- 	return document.getDocumentElement();
-     }
- 
-Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java
-===================================================================
-RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java,v
-retrieving revision 1.7
-retrieving revision 1.7.12.1
-diff -u -r1.7 -r1.7.12.1
---- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	9 Sep 2005 16:52:56 -0000	1.7
-+++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexBuilder.java	17 Jan 2006 10:54:06 -0000	1.7.12.1
-@@ -42,15 +42,17 @@
- import java.net.URL;
- import org.xml.sax.InputSource;
- import org.xml.sax.HandlerBase;
--import com.sun.xml.parser.Resolver;
--import com.sun.xml.tree.XmlDocument;
- import com.sun.xmlsearch.tree.*;
- import com.sun.xmlsearch.util.*;
- import com.sun.xmlsearch.db.*;
- import com.sun.xmlsearch.xml.XmlIndex;
- 
--import com.sun.xml.parser.Parser;
--import com.sun.xml.parser.ValidatingParser;
-+import javax.xml.parsers.DocumentBuilder;
-+import javax.xml.parsers.DocumentBuilderFactory;
-+import javax.xml.parsers.SAXParserFactory;
-+import javax.xml.parsers.SAXParser;
-+import org.xml.sax.Parser;
-+import org.w3c.dom.Document;
- 
- import com.jclark.xsl.om.*;
- import com.jclark.xsl.sax.*;
-@@ -465,8 +467,10 @@
- 	public void indexDocument(URL docURL, String title) throws Exception {
- 		InputSource source = new InputSource(docURL.openStream());
- 		source.setSystemId(docURL.toString());
--		Parser sourceParser = new Parser();
--		sourceParser.setFastStandalone(true);
-+                SAXParserFactory spf = SAXParserFactory.newInstance();
-+                spf.setValidating(false);
-+                SAXParser saxParser = spf.newSAXParser();
-+                Parser sourceParser = saxParser.getParser();
- 		XMLProcessorEx sourceLoader = new XMLProcessorImpl(sourceParser);
- 		//	long start = System.currentTimeMillis();
- 		Node root =
-@@ -545,8 +549,10 @@
- 		}
- 		// System.out.println(stylesheetUrl.toString());
- 		InputStream stylesheetStream = stylesheetUrl.openStream();
--		XmlDocument sheet =
--			XmlDocument.createXmlDocument(stylesheetStream, false);
-+                DocumentBuilderFactory dFactory = DocumentBuilderFactory.newInstance();
-+                dFactory.setValidating(false);
-+                DocumentBuilder dBuilder = dFactory.newDocumentBuilder();
-+                Document sheet = dBuilder.parse(stylesheetStream);
- 		return _transformEngine.createTransform(sheet);
- 	}
- 
-Index: XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java
-===================================================================
-RCS file: /cvs/util/XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java,v
-retrieving revision 1.2
-retrieving revision 1.2.12.1
-diff -u -r1.2 -r1.2.12.1
---- XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	9 Sep 2005 16:53:09 -0000	1.2
-+++ XmlSearch/src/com/sun/xmlsearch/xml/indexer/XmlIndexer.java	17 Jan 2006 10:54:07 -0000	1.2.12.1
-@@ -39,8 +39,6 @@
- import java.io.*;
- import java.util.*;
- 
--import com.sun.xml.tree.XmlDocument;
--import com.sun.xml.parser.Resolver;
- import org.w3c.dom.*;
- import org.xml.sax.InputSource;
- import org.xml.sax.SAXException;
diff --git a/editors/openoffice.org-3-RC/files/optpatch-freetype b/editors/openoffice.org-3-RC/files/optpatch-freetype
index b47f412488ec..775caad705c2 100644
--- a/editors/openoffice.org-3-RC/files/optpatch-freetype
+++ b/editors/openoffice.org-3-RC/files/optpatch-freetype
@@ -87,7 +87,7 @@ diff -u -r1.3 freetype-2.1.4.patch
 +    /*   do not #undef this macro here, since the build system might         */
 +    /*   define for certain configurations                                   */
 +    /*                                                                       */
-+! #define  TT_CONFIG_OPTION_BYTECODEpwd_INTERPRETER
++! #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 +  
 +  
 +    /*************************************************************************/
diff --git a/editors/openoffice.org-3-RC/files/patch-i58308 b/editors/openoffice.org-3-RC/files/patch-i58308
deleted file mode 100644
index aa4f34564669..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i58308
+++ /dev/null
@@ -1,26 +0,0 @@
-see: 
-http://lists.ximian.com/pipermail/openoffice/2006-January/001520.html
-http://lists.ximian.com/pipermail/openoffice/2006-January/001522.html
-http://lists.ximian.com/pipermail/openoffice/2006-January/001528.html
-
-Index: filter/source/config/fragments/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/config/fragments/makefile.mk,v
-retrieving revision 1.16
-retrieving revision 1.16.16.1
-diff -u -r1.16 -r1.16.16.1
---- filter/source/config/fragments/makefile.mk	14 Dec 2005 14:48:16 -0000	1.16
-+++ filter/source/config/fragments/makefile.mk	17 Jan 2006 11:03:31 -0000	1.16.16.1
-@@ -156,11 +156,7 @@
- MERGE:=python ../tools/merge/pyAltFCFGMerge
- .ELSE
- MERGE    := $(JAVAI) -jar $(CLASSDIR)$/FCFGMerge.jar
--.IF "$(JDK)" == "gcj"
--XALANCLASS=$(SOLARBINDIR)/xalan.jar
--CLASSPATH:=$(CLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(XALANCLASS:s/ /%Z*Z%/))}
--.ENDIF
--PACKLANG := $(JAVAI) org.apache.xalan.xslt.Process -XSL langfilter.xsl
-+PACKLANG := $(JAVAI) $(JAVACPS) $(SOLARBINDIR)/xalan.jar org.apache.xalan.xslt.Process -XSL langfilter.xsl
- .ENDIF
- 
- # -----------------------------------------------------------------------------
diff --git a/editors/openoffice.org-3-RC/files/patch-i59368 b/editors/openoffice.org-3-RC/files/patch-i59368
deleted file mode 100644
index 0d81635520e7..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i59368
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java,v
-retrieving revision 1.2
-diff -u -r1.2 ConvertData.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	24 Oct 2005 17:58:33 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/ConvertData.java	15 Apr 2006 00:36:23 -0000
-@@ -127,8 +127,8 @@
-      *           <code>Vector</code> of <code>Document</code> objects.
-      */
-     public Enumeration getDocumentEnumeration() {
--        Enumeration enum = v.elements();
--		return (enum);
-+        Enumeration enumer = v.elements();
-+		return (enumer);
- 	}
- 
- 
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 DocumentDeserializerImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	24 Oct 2005 18:12:55 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -155,14 +155,14 @@
-      */
-     public Document deserialize() throws ConvertException, IOException {
- 	log("\nFound the XSLT deserializer");
--	Enumeration enum = cd.getDocumentEnumeration();
-+	Enumeration enumer = cd.getDocumentEnumeration();
- 	org.w3c.dom.Document domDoc=null;
- 	DOMDocument docOut=null;
- 	GenericOfficeDocument doc = null;
- 	ByteArrayOutputStream baos =null;
- 	GenericOfficeDocument sxwDoc = new GenericOfficeDocument("output");
--	while (enum.hasMoreElements()) {       
--		 docOut = (DOMDocument) enum.nextElement();
-+	while (enumer.hasMoreElements()) {       
-+		 docOut = (DOMDocument) enumer.nextElement();
- 	}
- 	domDoc = docOut.getContentDOM();	
- 	try{
-Index: xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java
-===================================================================
-RCS file: /cvs/xml/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java,v
-retrieving revision 1.2
-diff -u -r1.2 PluginFactoryImpl.java
---- xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	24 Oct 2005 18:13:41 -0000	1.2
-+++ xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/PluginFactoryImpl.java	15 Apr 2006 00:36:23 -0000
-@@ -183,9 +183,9 @@
- 	String ext= ".txt";
- 	String mimeType = null;
- 	ConverterInfo ci = this.getConverterInfo();
--	Enumeration enum = ci.getDeviceMime();
--	while (enum.hasMoreElements()) {       
--	    mimeType= (String) enum.nextElement();
-+	Enumeration enumer = ci.getDeviceMime();
-+	while (enumer.hasMoreElements()) {       
-+	    mimeType= (String) enumer.nextElement();
- 	}
- 	try {
- 	    props.load(is);
diff --git a/editors/openoffice.org-3-RC/files/patch-i64412 b/editors/openoffice.org-3-RC/files/patch-i64412
deleted file mode 100644
index 6edf8d9c51a0..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-i64412
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: config_office/set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.97
-diff -u -r1.97 set_soenv.in
---- config_office/set_soenv.in	7 Apr 2006 08:02:29 -0000	1.97
-+++ config_office/set_soenv.in	14 Apr 2006 21:35:53 -0000
-@@ -342,6 +342,7 @@
-       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
-       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-+      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
-       if( @GCCVER@ >= 30401 ) {
-       	 $CVER        = "C341";
-       }
diff --git a/editors/openoffice.org-3-RC/files/patch-i64442 b/editors/openoffice.org-3-RC/files/patch-i64442
index 9b7670ffc11f..b018425305fb 100644
--- a/editors/openoffice.org-3-RC/files/patch-i64442
+++ b/editors/openoffice.org-3-RC/files/patch-i64442
@@ -1,28 +1,27 @@
-
 Index: jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
 ===================================================================
 RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
-retrieving revision 1.5
-diff -u -r1.5 gnujre.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	20 Jan 2006 10:54:22 -0000	1.5
-+++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	18 Apr 2006 02:29:16 -0000
-@@ -63,11 +63,11 @@
+retrieving revision 1.7
+diff -u -r1.7 gnujre.cxx
+--- jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	16 Mar 2006 13:13:00 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	28 May 2006 03:33:20 -0000
+@@ -63,13 +63,8 @@
  char const* const* GnuInfo::getRuntimePaths(int * size)
  {
      static char const* ar[]= {
+-#ifdef X86_64
+-          "/lib64/libgcj.so.7",
+-          "/lib64/libgcj.so.6"
+-#else
 -          "/lib/libgcj.so.7",
 -          "/lib/libgcj.so.6"
+-#endif
 +          "/libgcj.so.7",
 +          "/libgcj.so.6"
- #if 0   //unreliable
--	, "/lib/libgcj.so.5"
--        , "/lib/libgcj.so.4"
-+	, "/libgcj.so.5"
-+        , "/libgcj.so.4"
- #endif
      };
      *size = sizeof(ar) / sizeof (char*);
-@@ -86,7 +86,7 @@
+     return ar;
+@@ -87,7 +82,7 @@
      OUString sVersionProperty(
          RTL_CONSTASCII_USTRINGPARAM("java.version"));
      OUString sHomeProperty(
@@ -31,7 +30,7 @@ diff -u -r1.5 gnujre.cxx
      OUString sAccessProperty(
          RTL_CONSTASCII_USTRINGPARAM("javax.accessibility.assistive_technologies"));
  
-@@ -110,19 +110,8 @@
+@@ -111,19 +106,8 @@
          }
          else if (!bHome && sHomeProperty.equals(i->first))
          {
diff --git a/editors/openoffice.org-3-RC/files/patch-i64762 b/editors/openoffice.org-3-RC/files/patch-i64762
new file mode 100644
index 000000000000..70b535dd070c
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i64762
@@ -0,0 +1,19 @@
+Index: sal/osl/unx/security.c
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/security.c,v
+retrieving revision 1.18
+diff -u -r1.18 security.c
+--- sal/osl/unx/security.c	20 Apr 2006 16:24:05 -0000	1.18
++++ sal/osl/unx/security.c	25 Apr 2006 21:35:23 -0000
+@@ -57,6 +57,11 @@
+ #define PAM_BINARY_MSG 6
+ #endif
+ 
++#include <stdint.h> //C99 contains SIZE_MAX
++#ifndef SIZE_MAX 
++#define SIZE_MAX (sizeof (size_t) -1)
++#endif
++
+ extern oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode);
+ extern void* SAL_CALL osl_psz_getSymbol(oslModule hModule, const sal_Char* pszSymbolName);
+ static oslSecurityError SAL_CALL 
diff --git a/editors/openoffice.org-3-RC/files/patch-i64815 b/editors/openoffice.org-3-RC/files/patch-i64815
new file mode 100644
index 000000000000..0130e8e0223f
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i64815
@@ -0,0 +1,4767 @@
+cws bfsixtyfour
+Index: binfilter/bf_forms/source/component/forms_imgprod.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_forms/source/component/forms_imgprod.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.74.1
+diff -u -r1.3 -r1.3.74.1
+--- binfilter/bf_forms/source/component/forms_imgprod.cxx	7 Sep 2005 15:50:06 -0000	1.3
++++ binfilter/bf_forms/source/component/forms_imgprod.cxx	27 Apr 2006 15:56:43 -0000	1.3.74.1
+@@ -70,8 +70,8 @@
+ 						ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStreamRef );
+ 	virtual				~ImgProdLockBytes();
+ 
+-	virtual ErrCode		ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
+-	virtual ErrCode		WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten );
++	virtual ErrCode		ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_Size* pRead ) const;
++	virtual ErrCode		WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_Size* pWritten );
+ 	virtual ErrCode		Flush() const;
+ 	virtual ErrCode		SetSize( sal_uInt32 nSize );
+ 	virtual ErrCode		Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
+@@ -119,7 +119,7 @@
+ 
+ // ------------------------------------------------------------------------
+ 
+-ErrCode ImgProdLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const
++ErrCode ImgProdLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_Size* pRead ) const
+ {
+ 	if( GetStream() )
+ 	{
+@@ -150,7 +150,7 @@
+ 
+ // ------------------------------------------------------------------------
+ 
+-ErrCode ImgProdLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten )
++ErrCode ImgProdLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_Size* pWritten )
+ {
+ 	if( GetStream() )
+ 		return SvLockBytes::WriteAt( nPos, pBuffer, nCount, pWritten );
+Index: binfilter/bf_sc/source/core/data/sc_cell.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_cell.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sc/source/core/data/sc_cell.cxx	7 Sep 2005 16:39:37 -0000	1.5
++++ binfilter/bf_sc/source/core/data/sc_cell.cxx	27 Apr 2006 11:21:10 -0000	1.5.70.1
+@@ -916,7 +916,7 @@
+ /*N*/ //	rStream << (BYTE) 0x00;
+ /*N*/ #endif
+ /*N*/ 	if ( nFormatIndex )
+-/*N*/ 		rStream << (BYTE) (0x10 | sizeof(UINT32)) << nFormatIndex;
++/*N*/ 		rStream << (BYTE) (0x10 | sizeof(UINT32)) << static_cast<sal_uInt32>(nFormatIndex);
+ /*N*/ 	else
+ /*N*/ 		rStream << (BYTE) 0x00;
+ /*N*/ 	rStream << cFlags << (UINT16) nFormatType;
+Index: binfilter/bf_sc/source/core/data/sc_column3.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_column3.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.74.1
+diff -u -r1.6 -r1.6.74.1
+--- binfilter/bf_sc/source/core/data/sc_column3.cxx	7 Sep 2005 16:40:58 -0000	1.6
++++ binfilter/bf_sc/source/core/data/sc_column3.cxx	27 Apr 2006 11:22:41 -0000	1.6.74.1
+@@ -1212,7 +1212,7 @@
+ /*N*/ 		if (rString.Len() > 0)
+ /*N*/ 		{
+ /*N*/ 			double nVal;
+-/*N*/ 			ULONG nIndex, nOldIndex;
++/*N*/ 			sal_uInt32 nIndex, nOldIndex;
+ /*N*/ 			sal_Unicode cFirstChar;
+ /*N*/ 			SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
+ /*N*/ 			SfxObjectShell* pDocSh = pDocument->GetDocumentShell();
+Index: binfilter/bf_sc/source/core/data/sc_conditio.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_conditio.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.74.1
+diff -u -r1.5 -r1.5.74.1
+--- binfilter/bf_sc/source/core/data/sc_conditio.cxx	7 Sep 2005 16:41:15 -0000	1.5
++++ binfilter/bf_sc/source/core/data/sc_conditio.cxx	27 Apr 2006 11:26:20 -0000	1.5.74.1
+@@ -1181,7 +1181,7 @@
+ 
+ //------------------------------------------------------------------------
+ 
+-/*N*/ ScConditionalFormat::ScConditionalFormat(ULONG nNewKey, ScDocument* pDocument) :
++/*N*/ ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument) :
+ /*N*/ 	pDoc( pDocument ),
+ /*N*/ 	pAreas( NULL ),
+ /*N*/ 	nKey( nNewKey ),
+@@ -1585,7 +1585,7 @@
+ /*N*/ 	}
+ /*N*/ }
+ 
+-/*N*/ ScConditionalFormat* ScConditionalFormatList::GetFormat( ULONG nKey )
++/*N*/ ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey )
+ /*N*/ {
+ /*N*/ 	//!	binaer suchen
+ /*N*/ 
+Index: binfilter/bf_sc/source/core/data/sc_dociter.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_dociter.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sc/source/core/data/sc_dociter.cxx	7 Sep 2005 16:41:50 -0000	1.6
++++ binfilter/bf_sc/source/core/data/sc_dociter.cxx	27 Apr 2006 11:31:33 -0000	1.6.72.1
+@@ -508,7 +508,7 @@
+ /*N*/  	for (i=0; (i<nCount) && (aParam.GetEntry(i).bDoQuery); i++)
+ /*N*/  	{
+ /*N*/  		ScQueryEntry& rEntry = aParam.GetEntry(i);
+-/*N*/  		ULONG nIndex = 0;
++/*N*/  		sal_uInt32 nIndex = 0;
+ /*N*/  		rEntry.bQueryByString =
+ /*N*/  				!(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
+ /*N*/  	}
+@@ -794,7 +794,7 @@
+ /*N*/ 		for (i=0; (i<MAXQUERY) && (aParam.GetEntry(i).bDoQuery); i++)
+ /*N*/ 		{
+ /*?*/ 			ScQueryEntry& rEntry = aParam.GetEntry(i);
+-/*?*/ 			ULONG nIndex = 0;
++/*?*/ 			sal_uInt32 nIndex = 0;
+ /*?*/ 			rEntry.bQueryByString =
+ /*?*/ 					 !(pDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr,
+ /*?*/ 															  nIndex, rEntry.nVal));
+Index: binfilter/bf_sc/source/core/data/sc_document.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_document.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.48.1
+diff -u -r1.9 -r1.9.48.1
+--- binfilter/bf_sc/source/core/data/sc_document.cxx	14 Dec 2005 14:33:35 -0000	1.9
++++ binfilter/bf_sc/source/core/data/sc_document.cxx	27 Apr 2006 13:17:44 -0000	1.9.48.1
+@@ -2025,7 +2025,7 @@
+ 
+ 
+ /*N*/ void ScDocument::GetNumberFormat( USHORT nCol, USHORT nRow, USHORT nTab,
+-/*N*/ 								  ULONG& rFormat )
++/*N*/ 								  sal_uInt32& rFormat )
+ /*N*/ {
+ /*N*/ 	if (VALIDTAB(nTab))
+ /*N*/ 		if (pTab[nTab])
+Index: binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.74.1
+diff -u -r1.5 -r1.5.74.1
+--- binfilter/bf_sc/source/core/data/sc_dpshttab.cxx	7 Sep 2005 16:46:45 -0000	1.5
++++ binfilter/bf_sc/source/core/data/sc_dpshttab.cxx	27 Apr 2006 11:33:21 -0000	1.5.74.1
+@@ -105,7 +105,7 @@
+ /*M*/             }
+ /*M*/             else
+ /*M*/             {
+-/*M*/ 		        ULONG nIndex = 0;
++/*M*/ 		        sal_uInt32 nIndex = 0;
+ /*M*/ 		        rEntry.bQueryByString =
+ /*M*/ 					        !(pD->GetFormatTable()->
+ /*M*/ 						        IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal));
+Index: binfilter/bf_sc/source/core/data/sc_table3.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_table3.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.74.1
+diff -u -r1.5 -r1.5.74.1
+--- binfilter/bf_sc/source/core/data/sc_table3.cxx	7 Sep 2005 16:54:02 -0000	1.5
++++ binfilter/bf_sc/source/core/data/sc_table3.cxx	27 Apr 2006 11:34:29 -0000	1.5.74.1
+@@ -1050,7 +1050,7 @@
+ /*N*/                         bOk = pTransliteration->isEqual( aCellStr, *rEntry.pStr );
+ /*N*/ 					else
+ /*N*/ 					{
+-/*N*/                         ::com::sun::star::uno::Sequence< long > xOff;
++/*N*/                         ::com::sun::star::uno::Sequence< sal_Int32 > xOff;
+ /*N*/                         String aCell( pTransliteration->transliterate(
+ /*N*/                             aCellStr, ScGlobal::eLnge, 0, aCellStr.Len(),
+ /*N*/                             &xOff ) );
+Index: binfilter/bf_sc/source/core/data/sc_validat.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/data/sc_validat.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sc/source/core/data/sc_validat.cxx	7 Sep 2005 16:55:35 -0000	1.5
++++ binfilter/bf_sc/source/core/data/sc_validat.cxx	27 Apr 2006 11:36:46 -0000	1.5.72.1
+@@ -558,7 +558,7 @@
+ /*N*/ 	//!		sortierte Eintraege aus rList schneller einfuegen ???
+ /*N*/ }
+ 
+-/*N*/ ScValidationData* ScValidationDataList::GetData( ULONG nKey )
++/*N*/ ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey )
+ /*N*/ {
+ /*N*/ 	//!	binaer suchen
+ /*N*/ 
+Index: binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sc/source/core/tool/sc_chartarr.cxx	7 Sep 2005 17:04:56 -0000	1.5
++++ binfilter/bf_sc/source/core/tool/sc_chartarr.cxx	27 Apr 2006 16:28:07 -0000	1.5.70.1
+@@ -68,7 +68,7 @@
+ /*N*/ 	rDest.SetYAxisTitle( rSource.GetYAxisTitle() );
+ /*N*/ 	rDest.SetZAxisTitle( rSource.GetZAxisTitle() );
+ /*N*/ 
+-/*N*/ 	const long* pArr;
++/*N*/ 	const sal_Int32* pArr;
+ /*N*/ 	if ( rSource.GetRowCount() == rDest.GetRowCount() &&
+ /*N*/ 		 rSource.GetColCount() == rDest.GetColCount() )
+ /*N*/ 	{
+@@ -698,7 +698,7 @@
+ /*?*/ 							nVal = ((ScValueCell*)pCell)->GetValue();
+ /*?*/ 							if ( bCalcAsShown && nVal != 0.0 )
+ /*?*/ 							{
+-/*?*/ 								ULONG nFormat;
++/*?*/ 								sal_uInt32 nFormat;
+ /*?*/ 								pDocument->GetNumberFormat( pCols[nCol],
+ /*?*/ 									pRows[nRow], nTab1, nFormat );
+ /*?*/ 								nVal = pDocument->RoundValueAsShown( nVal, nFormat );
+Index: binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_compiler.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.72.1
+diff -u -r1.8 -r1.8.72.1
+--- binfilter/bf_sc/source/core/tool/sc_compiler.cxx	7 Sep 2005 17:06:44 -0000	1.8
++++ binfilter/bf_sc/source/core/tool/sc_compiler.cxx	27 Apr 2006 16:28:08 -0000	1.8.72.1
+@@ -877,7 +877,7 @@
+ /*N*/ BOOL ScCompiler::IsValue( const String& rSym )
+ /*N*/ {
+ /*N*/ 	double fVal;
+-/*N*/ 	ULONG nIndex = ( pSymbolTable == pSymbolTableEnglish ?
++/*N*/ 	sal_uInt32 nIndex = ( pSymbolTable == pSymbolTableEnglish ?
+ /*N*/ 		pDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ) : 0 );
+ /*N*/ //	ULONG nIndex = 0;
+ /*N*/ ////	ULONG nIndex = pDoc->GetFormatTable()->GetStandardIndex(ScGlobal::eLnge);
+Index: binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sc/source/core/tool/sc_interpr1.cxx	7 Sep 2005 17:11:00 -0000	1.5
++++ binfilter/bf_sc/source/core/tool/sc_interpr1.cxx	27 Apr 2006 16:28:08 -0000	1.5.72.1
+@@ -1770,7 +1770,7 @@
+ void ScInterpreter::ScValue()
+ {
+ 	String aInputString = GetString();
+-	ULONG nFIndex = 0;					// damit default Land/Spr.
++	sal_uInt32 nFIndex = 0;					// damit default Land/Spr.
+ 	double fVal;
+ 	if (pFormatter->IsNumberFormat(aInputString, nFIndex, fVal))
+ 		PushDouble(fVal);
+@@ -2080,7 +2080,7 @@
+ /*?*/ 				if( eFunc == ifCOUNT )
+ /*?*/ 				{
+ /*?*/ 					String aStr( PopString() );
+-/*?*/ 					ULONG nFIndex = 0;					// damit default Land/Spr.
++/*?*/ 					sal_uInt32 nFIndex = 0;					// damit default Land/Spr.
+ /*?*/ 					if ( bTextAsZero || pFormatter->IsNumberFormat(aStr, nFIndex, fVal))
+ /*?*/ 						nCount++;
+ /*?*/ 				}
+@@ -3074,7 +3074,7 @@
+  			else if( rString.Len() )
+  			{
+  				rParam.FillInExcelSyntax(rString,(USHORT) 0);
+- 				ULONG nIndex = 0;
++ 				sal_uInt32 nIndex = 0;
+  				rEntry.bQueryByString =
+  					!(pFormatter->IsNumberFormat(
+  						*rEntry.pStr, nIndex, rEntry.nVal));
+@@ -3244,7 +3244,7 @@
+  			else
+  			{
+  				rParam.FillInExcelSyntax(rString,(USHORT) 0);
+- 				ULONG nIndex = 0;
++ 				sal_uInt32 nIndex = 0;
+  				rEntry.bQueryByString =
+  					!(pFormatter->IsNumberFormat(
+  						*rEntry.pStr, nIndex, rEntry.nVal));
+@@ -4346,7 +4346,7 @@
+ 						ScQueryEntry& rEntry = rParam.GetEntry(i);
+ 						if ( rEntry.bDoQuery )
+ 						{
+-							ULONG nIndex = 0;
++							sal_uInt32 nIndex = 0;
+ 							rEntry.bQueryByString = !pFormatter->IsNumberFormat(
+ 								*rEntry.pStr, nIndex, rEntry.nVal );
+ 							if ( rEntry.bQueryByString && !rParam.bRegExp )
+Index: binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sc/source/core/tool/sc_interpr2.cxx	7 Sep 2005 17:11:19 -0000	1.5
++++ binfilter/bf_sc/source/core/tool/sc_interpr2.cxx	27 Apr 2006 16:28:08 -0000	1.5.70.1
+@@ -172,7 +172,7 @@
+ void ScInterpreter::ScGetDateValue()
+ {
+ 	String aInputString = GetString();
+-	ULONG nFIndex = 0;					// damit default Land/Spr.
++	sal_uInt32 nFIndex = 0;					// damit default Land/Spr.
+ 	double fVal;
+ 	if (pFormatter->IsNumberFormat(aInputString, nFIndex, fVal))
+ 	{
+@@ -361,7 +361,7 @@
+ void ScInterpreter::ScGetTimeValue()
+ {
+ 	String aInputString = GetString();
+-	ULONG nFIndex = 0;					// damit default Land/Spr.
++	sal_uInt32 nFIndex = 0;					// damit default Land/Spr.
+ 	double fVal;
+ 	if (pFormatter->IsNumberFormat(aInputString, nFIndex, fVal))
+ 	{
+Index: binfilter/bf_sc/source/core/tool/sc_interpr4.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_interpr4.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sc/source/core/tool/sc_interpr4.cxx	7 Sep 2005 17:11:58 -0000	1.6
++++ binfilter/bf_sc/source/core/tool/sc_interpr4.cxx	27 Apr 2006 16:28:08 -0000	1.6.70.1
+@@ -1288,7 +1288,7 @@
+ /*N*/ 		case svString:
+ /*N*/ 		{
+ /*N*/ 			String aStr(PopString());
+-/*N*/ 			ULONG nFIndex = 0;					// damit default Land/Spr.
++/*N*/ 			sal_uInt32 nFIndex = 0;					// damit default Land/Spr.
+ /*N*/ 			if(!pFormatter->IsNumberFormat( aStr, nFIndex, nVal ) )
+ /*N*/ 			{
+ /*N*/ 				SetError(errIllegalArgument);
+Index: binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/core/tool/sc_rechead.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.74.1
+diff -u -r1.4 -r1.4.74.1
+--- binfilter/bf_sc/source/core/tool/sc_rechead.cxx	7 Sep 2005 17:16:09 -0000	1.4
++++ binfilter/bf_sc/source/core/tool/sc_rechead.cxx	27 Apr 2006 16:28:08 -0000	1.4.74.1
+@@ -54,7 +54,7 @@
+ /*N*/ ScReadHeader::ScReadHeader(SvStream& rNewStream) :
+ /*N*/ 	rStream( rNewStream )
+ /*N*/ {
+-/*N*/ 	ULONG nDataSize;
++/*N*/ 	sal_uInt32 nDataSize;
+ /*N*/ 	rStream >> nDataSize;
+ /*N*/ 	nDataEnd = rStream.Tell() + nDataSize;
+ /*N*/ }
+@@ -83,7 +83,7 @@
+ 
+ // -----------------------------------------------------------------------
+ 
+-/*N*/ ScWriteHeader::ScWriteHeader(SvStream& rNewStream, ULONG nDefault) :
++/*N*/ ScWriteHeader::ScWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault) :
+ /*N*/ 	rStream( rNewStream )
+ /*N*/ {
+ /*N*/ 	nDataSize = nDefault;
+@@ -110,7 +110,7 @@
+ /*N*/ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) :
+ /*N*/ 	rStream( rNewStream )
+ /*N*/ {
+-/*N*/ 	ULONG nDataSize;
++/*N*/ 	sal_uInt32 nDataSize;
+ /*N*/ 	rStream >> nDataSize;
+ /*N*/ 	ULONG nDataPos = rStream.Tell();
+ /*N*/ 	nTotalEnd = nDataPos + nDataSize;
+@@ -131,7 +131,7 @@
+ /*N*/ 	}
+ /*N*/ 	else
+ /*N*/ 	{
+-/*N*/ 		ULONG nSizeTableLen;
++/*N*/ 		sal_uInt32 nSizeTableLen;
+ /*N*/ 		rStream >> nSizeTableLen;
+ /*N*/ 		pBuf = new BYTE[nSizeTableLen];
+ /*N*/ 		rStream.Read( pBuf, nSizeTableLen );
+@@ -173,7 +173,7 @@
+ /*N*/ void ScMultipleReadHeader::StartEntry()
+ /*N*/ {
+ /*N*/ 	ULONG nPos = rStream.Tell();
+-/*N*/ 	ULONG nEntrySize;
++/*N*/ 	sal_uInt32 nEntrySize;
+ /*N*/ 	(*pMemStream) >> nEntrySize;
+ /*N*/ 
+ /*N*/ 	nEntryEnd = nPos + nEntrySize;
+@@ -192,7 +192,7 @@
+ 
+ // -----------------------------------------------------------------------
+ 
+-/*N*/ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, ULONG nDefault) :
++/*N*/ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault) :
+ /*N*/ 	rStream( rNewStream ),
+ /*N*/ 	aMemStream( 4096, 4096 )
+ /*N*/ {
+@@ -208,7 +208,7 @@
+ /*N*/ 	ULONG nDataEnd = rStream.Tell();
+ /*N*/ 
+ /*N*/ 	rStream << (USHORT) SCID_SIZES;
+-/*N*/ 	rStream << aMemStream.Tell();
++/*N*/ 	rStream << static_cast<sal_uInt32>(aMemStream.Tell());
+ /*N*/ 	rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
+ /*N*/ 
+ /*N*/ 	if ( nDataEnd - nDataPos != nDataSize )					// Default getroffen?
+@@ -224,7 +224,7 @@
+ /*N*/ void ScMultipleWriteHeader::EndEntry()
+ /*N*/ {
+ /*N*/ 	ULONG nPos = rStream.Tell();
+-/*N*/ 	aMemStream << nPos - nEntryStart;
++/*N*/ 	aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart);
+ /*N*/ }
+ 
+ /*N*/ void ScMultipleWriteHeader::StartEntry()
+Index: binfilter/bf_sc/source/ui/app/sc_inputhdl.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/ui/app/sc_inputhdl.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sc/source/ui/app/sc_inputhdl.cxx	7 Sep 2005 18:46:14 -0000	1.5
++++ binfilter/bf_sc/source/ui/app/sc_inputhdl.cxx	28 Apr 2006 08:58:34 -0000	1.5.70.1
+@@ -2029,7 +2029,7 @@
+ /*?*/ 			ScDocument* pDoc = pActiveViewSh->GetViewData()->GetDocument();
+ /*?*/ 			SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ /*?*/ 			// without conditional format, as in ScColumn::SetString
+-/*?*/ 			ULONG nFormat = pLastPattern->GetNumberFormat( pFormatter );
++/*?*/ 			sal_uInt32 nFormat = pLastPattern->GetNumberFormat( pFormatter );
+ /*?*/ 			double nVal;
+ /*?*/ 			if ( pFormatter->IsNumberFormat( aString, nFormat, nVal ) )
+ /*?*/ 			{
+Index: binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx	7 Sep 2005 19:07:03 -0000	1.5
++++ binfilter/bf_sc/source/ui/docshell/sc_docfunc.cxx	27 Apr 2006 11:38:29 -0000	1.5.72.1
+@@ -986,7 +986,7 @@
+ /*N*/ 	else		// (nur) auf englisches Zahlformat testen
+ /*N*/ 	{
+ /*?*/ 		SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+-/*?*/ 		ULONG nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
++/*?*/ 		sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
+ /*?*/ 		double fVal;
+ /*?*/ 		if ( pFormatter->IsNumberFormat( rText, nEnglish, fVal ) )
+ /*?*/ 			pNewCell = new ScValueCell( fVal );
+Index: binfilter/bf_sc/source/ui/docshell/sc_impex.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/ui/docshell/sc_impex.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.10.1
+diff -u -r1.7 -r1.7.10.1
+--- binfilter/bf_sc/source/ui/docshell/sc_impex.cxx	7 Apr 2006 13:21:16 -0000	1.7
++++ binfilter/bf_sc/source/ui/docshell/sc_impex.cxx	27 Apr 2006 11:39:17 -0000	1.7.10.1
+@@ -803,7 +803,7 @@
+ /*M*/ 		//!	SetString mit Extra-Flag ???
+ /*M*/ 
+ /*M*/ 		SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+-/*M*/ 		ULONG nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
++/*M*/ 		sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
+ /*M*/ 		double fVal;
+ /*M*/ 		if ( pFormatter->IsNumberFormat( rStr, nEnglish, fVal ) )
+ /*M*/ 		{
+Index: binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx	7 Sep 2005 21:10:02 -0000	1.4
++++ binfilter/bf_sc/source/ui/unoobj/sc_cellsuno.cxx	27 Apr 2006 12:43:39 -0000	1.4.72.1
+@@ -1319,7 +1319,7 @@
+                 // Since the English formatter was constructed with
+                 // LANGUAGE_ENGLISH_US the "General" format has index key 0,
+                 // we don't have to query.
+-				ULONG nNumFmt = bEnglish ?
++				sal_uInt32 nNumFmt = bEnglish ?
+ //						pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) :
+                         0 :
+ 						pDoc->GetNumberFormat( rPosition );
+Index: binfilter/bf_sc/source/ui/view/sc_tabvwsha.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sc/source/ui/view/sc_tabvwsha.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sc/source/ui/view/sc_tabvwsha.cxx	7 Sep 2005 21:38:27 -0000	1.5
++++ binfilter/bf_sc/source/ui/view/sc_tabvwsha.cxx	27 Apr 2006 13:34:03 -0000	1.5.72.1
+@@ -110,7 +110,7 @@
+ /*N*/ 		aStr += '=';
+ /*N*/ 
+ /*N*/ 		//	Anzahl im Standardformat, die anderen nach Cursorposition
+-/*N*/ 		ULONG nNumFmt = 0;
++/*N*/ 		sal_uInt32 nNumFmt = 0;
+ /*N*/ 		SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ /*N*/ 		if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 )
+ /*N*/ 		{
+@@ -525,7 +525,7 @@
+ /*N*/ 					//!	Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen
+ /*N*/ 
+ /*?*/ 					SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+-/*?*/ 					ULONG nNumFmt;
++/*?*/ 					sal_uInt32 nNumFmt;
+ /*?*/ 					pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt );
+ /*?*/ 					double fDummy;
+ /*?*/ 					if ( pFormatter->IsNumberFormat(aString, nNumFmt, fDummy) )
+Index: binfilter/bf_sch/source/core/sch_chartdoc.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sch/source/core/sch_chartdoc.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.52.1
+diff -u -r1.6 -r1.6.52.1
+--- binfilter/bf_sch/source/core/sch_chartdoc.cxx	14 Dec 2005 14:33:48 -0000	1.6
++++ binfilter/bf_sch/source/core/sch_chartdoc.cxx	27 Apr 2006 11:41:29 -0000	1.6.52.1
+@@ -346,7 +346,7 @@
+ /*N*/ 		SchIOCompat aIO(rOut, STREAM_WRITE, 1);
+ /*N*/ 
+ /*N*/ 		// AF: Don't write VCItemPool any longer (01/2001)
+-/*N*/ 		rOut << (ULONG)0L;
++/*N*/ 		rOut << (sal_uInt32)0L;
+ /*N*/ 
+ 		/**************************************************************************
+ 		* Frueher (StarChart Version 3.0, File-Format Version 1) wurde hier das
+@@ -416,7 +416,7 @@
+ /*N*/ 	{
+ /*N*/ 		SchIOCompat aIO(rIn, STREAM_READ);
+ /*N*/ 
+-/*N*/ 		ULONG n;
++/*N*/ 		sal_uInt32 n;
+ /*N*/ 		rIn >> n;
+ /*N*/ 		// must be 0 or 1. Otherwise we have an error
+ /*N*/ 		// most probably a wrong password
+Index: binfilter/bf_sch/source/core/sch_chtmode2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sch/source/core/sch_chtmode2.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.28.1
+diff -u -r1.8 -r1.8.28.1
+--- binfilter/bf_sch/source/core/sch_chtmode2.cxx	9 Feb 2006 15:09:05 -0000	1.8
++++ binfilter/bf_sch/source/core/sch_chtmode2.cxx	27 Apr 2006 11:43:00 -0000	1.8.28.1
+@@ -2169,7 +2169,7 @@
+ /*N*/ 			{
+ /*N*/ 				BOOL bNeedMerge=FALSE;
+ /*N*/ 				String aFmtStr;
+-/*N*/ 				ULONG nId;
++/*N*/ 				sal_uInt32 nId;
+ /*N*/ 				if(nVersion <= 11)//ab V 12 X=Y=Z-Numberformatter!
+ /*N*/ 				{
+ /*?*/ 					SvNumberFormatter *pTmp = new SvNumberFormatter( ::legacy_binfilters::getLegacyProcessServiceFactory(),
+Index: binfilter/bf_sch/source/core/sch_memchrt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sch/source/core/sch_memchrt.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.28.1
+diff -u -r1.9 -r1.9.28.1
+--- binfilter/bf_sch/source/core/sch_memchrt.cxx	9 Feb 2006 15:09:23 -0000	1.9
++++ binfilter/bf_sch/source/core/sch_memchrt.cxx	27 Apr 2006 11:44:43 -0000	1.9.28.1
+@@ -201,12 +201,12 @@
+ /*N*/ 	nColCnt = nCols;
+ /*N*/ 	pData   = new double[nColCnt * nRowCnt];
+ /*N*/ 
+-/*N*/ 	pRowNumFmtId= new long [nRowCnt];
+-/*N*/ 	pColNumFmtId= new long [nColCnt];
++/*N*/ 	pRowNumFmtId= new sal_Int32 [nRowCnt];
++/*N*/ 	pColNumFmtId= new sal_Int32 [nColCnt];
+ /*N*/ 	InitNumFmt();
+ /*N*/ 
+-/*N*/ 	pRowTable	= new long [nRowCnt];
+-/*N*/ 	pColTable	= new long [nColCnt];
++/*N*/ 	pRowTable	= new sal_Int32 [nRowCnt];
++/*N*/ 	pColTable	= new sal_Int32 [nColCnt];
+ /*N*/ 	ResetTranslation(pRowTable,nRowCnt);
+ /*N*/ 	ResetTranslation(pColTable,nColCnt);
+ /*N*/ 
+@@ -284,10 +284,10 @@
+ /*N*/ 	aSomeData4  = ((SchMemChart&) rMemChart).SomeData4 ();
+ /*N*/ 	pData       = new double[nColCnt * nRowCnt];
+ /*N*/ 
+-/*N*/ 	pRowNumFmtId= new long [nRowCnt];
+-/*N*/ 	pColNumFmtId= new long [nColCnt];
+-/*N*/ 	pRowTable	= new long [nRowCnt];
+-/*N*/ 	pColTable	= new long [nColCnt];
++/*N*/ 	pRowNumFmtId= new sal_Int32 [nRowCnt];
++/*N*/ 	pColNumFmtId= new sal_Int32 [nColCnt];
++/*N*/ 	pRowTable	= new sal_Int32 [nRowCnt];
++/*N*/ 	pColTable	= new sal_Int32 [nColCnt];
+ /*N*/ 
+ /*N*/     aAppLink = rMemChart.aAppLink;
+ /*N*/ 	nLastSelInfoReturn = rMemChart.nLastSelInfoReturn;
+@@ -745,10 +745,10 @@
+ /*N*/ 
+ /*N*/ 	rIn >> nInt16; rMemChart.eDataType = (short)nInt16;
+ /*N*/ 
+-/*N*/ 	rMemChart.pRowNumFmtId	= new long [rMemChart.nRowCnt];
+-/*N*/ 	rMemChart.pColNumFmtId	= new long [rMemChart.nColCnt];
+-/*N*/ 	rMemChart.pRowTable		= new long [rMemChart.nRowCnt];
+-/*N*/ 	rMemChart.pColTable		= new long [rMemChart.nColCnt];
++/*N*/ 	rMemChart.pRowNumFmtId	= new sal_Int32 [rMemChart.nRowCnt];
++/*N*/ 	rMemChart.pColNumFmtId	= new sal_Int32 [rMemChart.nColCnt];
++/*N*/ 	rMemChart.pRowTable		= new sal_Int32 [rMemChart.nRowCnt];
++/*N*/ 	rMemChart.pColTable		= new sal_Int32 [rMemChart.nColCnt];
+ /*N*/ 
+ /*N*/ 	if(aIO.GetVersion()>=1)
+ /*N*/ 	{
+Index: binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx	7 Sep 2005 23:10:16 -0000	1.5
++++ binfilter/bf_sch/source/ui/unoidl/sch_ChXChartDocument.cxx	27 Apr 2006 11:04:43 -0000	1.5.70.1
+@@ -1661,7 +1661,7 @@
+             short nColCount = pData->GetColCount();
+             aResult.realloc( nColCount );
+             sal_Int32* pSeq = aResult.getArray();
+-            const long* pTransArray = pData->GetColTranslation();
++            const sal_Int32* pTransArray = pData->GetColTranslation();
+             sal_Int32 i;
+ 
+             if( nTranslation == TRANS_COL &&
+@@ -1682,7 +1682,7 @@
+             short nRowCount = pData->GetRowCount();
+             aResult.realloc( nRowCount );
+             sal_Int32* pSeq = aResult.getArray();
+-            const long* pTransArray = pData->GetRowTranslation();
++            const sal_Int32* pTransArray = pData->GetRowTranslation();
+             sal_Int32 i;
+ 
+             if( nTranslation == TRANS_ROW &&
+Index: binfilter/bf_sd/source/core/sd_drawdoc.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sd/source/core/sd_drawdoc.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.10.1
+diff -u -r1.7 -r1.7.10.1
+--- binfilter/bf_sd/source/core/sd_drawdoc.cxx	7 Apr 2006 13:23:05 -0000	1.7
++++ binfilter/bf_sd/source/core/sd_drawdoc.cxx	27 Apr 2006 12:05:38 -0000	1.7.10.1
+@@ -675,12 +675,12 @@
+ /*N*/ 		rOut << aJobSetup;
+ /*N*/ 	}
+ /*N*/ 
+-/*N*/ 	rOut << (ULONG) rDoc.eLanguage;
++/*N*/ 	rOut << (sal_uInt32) rDoc.eLanguage;
+ /*N*/ 
+ 	/**************************************************************************
+ 	* FrameViews schreiben
+ 	**************************************************************************/
+-/*N*/ 	ULONG nFrameViewCount = 0;
++/*N*/ 	sal_uInt32 nFrameViewCount = 0;
+ /*N*/ 	SdViewShell* pViewSh = NULL;
+ /*N*/ 	SfxViewShell* pSfxViewSh = NULL;
+ /*N*/ 	SfxViewFrame* pSfxViewFrame = SfxViewFrame::GetFirst(rDoc.pDocSh,
+@@ -741,7 +741,7 @@
+ /*N*/ 	rOut << rDoc.bCustomShow;
+ /*N*/ 
+ /*N*/ 	// Anzahl CustomShows schreiben
+-/*N*/ 	ULONG nCustomShowCount = 0;
++/*N*/ 	sal_uInt32 nCustomShowCount = 0;
+ /*N*/ 
+ /*N*/ 	if (rDoc.pCustomShowList)
+ /*N*/ 	{
+@@ -760,12 +760,12 @@
+ 		}
+ 
+ 		// Position der aktuellen CustomShow
+-		ULONG nCurPos = rDoc.pCustomShowList->GetCurPos();
++		sal_uInt32 nCurPos = rDoc.pCustomShowList->GetCurPos();
+ 		rOut << nCurPos;
+ 	}
+ 
+ /*N*/ 	// ab Version 15
+-/*N*/ 	rOut << (ULONG) rDoc.GetPageNumType();
++/*N*/ 	rOut << (sal_uInt32) rDoc.GetPageNumType();
+ /*N*/ 
+ /*N*/ 	// ab Version 17
+ /*N*/ 	rOut << rDoc.GetPresPause() << rDoc.IsPresShowLogo();
+@@ -882,7 +882,7 @@
+ /*N*/ 
+ /*N*/ 	if (rDoc.nFileFormatVersion >= 3)
+ /*N*/ 	{
+-/*N*/ 		ULONG nTmp;
++/*N*/ 		sal_uInt32 nTmp;
+ /*N*/ 		rIn >> nTmp;
+ /*N*/ 		rDoc.SetLanguage( (LanguageType) nTmp, EE_CHAR_LANGUAGE );
+ /*N*/ 	}
+@@ -910,7 +910,7 @@
+ /*N*/ 		const SvtSaveOptions aOptions;
+ /*N*/ 		BOOL bIsSaveDocView = aOptions.IsSaveDocView();
+ /*N*/ 
+-/*N*/ 		ULONG nFrameViewCount = 0;
++/*N*/ 		sal_uInt32 nFrameViewCount = 0;
+ /*N*/ 		rIn >> nFrameViewCount;
+ /*N*/ 
+ /*N*/ 		for (nCount=0; nCount<nFrameViewCount; nCount++)
+@@ -998,7 +998,7 @@
+ /*N*/ 		// CustomShow aktiv
+ /*N*/ 		rIn >> rDoc.bCustomShow;
+ /*N*/ 
+-/*N*/ 		ULONG nCustomShowCount = 0;
++/*N*/ 		sal_uInt32 nCustomShowCount = 0;
+ /*N*/ 		rIn >> nCustomShowCount;
+ /*N*/ 
+ /*N*/ 		if (nCustomShowCount > 0)
+@@ -1022,7 +1022,7 @@
+ 			}
+ 
+ 			// Aktuelle CustomShow selektieren
+-			ULONG nCurPos;
++			sal_uInt32 nCurPos;
+ 			rIn >> nCurPos;
+ 			rDoc.pCustomShowList->Seek(nCurPos);
+ 		}
+@@ -1030,14 +1030,14 @@
+ /*N*/ 
+ /*N*/ 	if (rDoc.nFileFormatVersion >= 15)
+ /*N*/ 	{
+-/*N*/ 		ULONG nTmp;
++/*N*/ 		sal_uInt32 nTmp;
+ /*N*/ 		rIn >> nTmp;
+ /*N*/ 		rDoc.SetPageNumType( (SvxNumType) nTmp );
+ /*N*/ 	}
+ /*N*/ 
+ /*N*/ 	if (rDoc.nFileFormatVersion >= 17)
+ /*N*/ 	{
+-/*N*/ 		ULONG	nPauseSec;
++/*N*/ 		sal_uInt32 nPauseSec;
+ /*N*/ 		BOOL	bShowLogo;
+ /*N*/ 
+ /*N*/ 		rIn >> nPauseSec >> bShowLogo;
+Index: binfilter/bf_sd/source/core/sd_sdpage2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sd/source/core/sd_sdpage2.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.72.1
+diff -u -r1.8 -r1.8.72.1
+--- binfilter/bf_sd/source/core/sd_sdpage2.cxx	7 Sep 2005 23:24:33 -0000	1.8
++++ binfilter/bf_sd/source/core/sd_sdpage2.cxx	27 Apr 2006 12:08:04 -0000	1.8.72.1
+@@ -364,10 +364,10 @@
+ /*N*/ 
+ /*N*/ 	// Selektionskennung ist nicht persistent, wird nicht geschrieben
+ /*N*/ 
+-/*N*/ 	ULONG nULTemp;
+-/*N*/ 	nULTemp = (ULONG)eFadeSpeed;
++/*N*/ 	sal_uInt32 nULTemp;
++/*N*/ 	nULTemp = (sal_uInt32)eFadeSpeed;
+ /*N*/ 	rOut << nULTemp;
+-/*N*/ 	nULTemp = (ULONG)eFadeEffect;
++/*N*/ 	nULTemp = (sal_uInt32)eFadeEffect;
+ /*N*/ 	rOut << nULTemp;
+ /*N*/ 	rOut << bManual;
+ /*N*/ 	rOut << nTime;
+@@ -478,7 +478,7 @@
+ /*N*/ 
+ /*N*/ 	// Selektionskennung ist nicht persistent, wird nicht gelesen
+ /*N*/ 
+-/*N*/ 	ULONG nULTemp;
++/*N*/ 	sal_uInt32 nULTemp;
+ /*N*/ 	rIn >> nULTemp; eFadeSpeed	= (FadeSpeed)nULTemp;
+ /*N*/ 	rIn >> nULTemp; eFadeEffect = (presentation::FadeEffect)nULTemp;
+ /*N*/ 	rIn >> bManual;
+Index: binfilter/bf_sd/source/ui/inc/AccessiblePageShape.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sd/source/ui/inc/AccessiblePageShape.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_sd/source/ui/inc/AccessiblePageShape.hxx	8 Sep 2005 00:27:42 -0000	1.3
++++ binfilter/bf_sd/source/ui/inc/AccessiblePageShape.hxx	28 Apr 2006 08:58:34 -0000	1.3.72.1
+@@ -114,7 +114,7 @@
+ 	//=====  XAccessibleContext  ==============================================
+ 
+     ///	Returns always 0 because there can be no children.
+-    virtual long SAL_CALL
++    virtual sal_Int32 SAL_CALL
+     	getAccessibleChildCount (void)
+         throw ();
+         
+Index: binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.70.1
+diff -u -r1.4 -r1.4.70.1
+--- binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx	8 Sep 2005 01:27:27 -0000	1.4
++++ binfilter/bf_sd/source/ui/unoidl/sd_unoobj.cxx	28 Apr 2006 08:58:35 -0000	1.4.70.1
+@@ -156,7 +156,7 @@
+ 
+ ///////////////////////////////////////////////////////////////////////
+ 
+-DECLARE_STL_STDKEY_MAP(sal_uInt32, SfxExtItemPropertySetInfo*, SdExtPropertySetInfoCache);
++DECLARE_STL_STDKEY_MAP(sal_uIntPtr, SfxExtItemPropertySetInfo*, SdExtPropertySetInfoCache);
+ static SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
+ static SdExtPropertySetInfoCache gImplDrawPropertySetInfoCache;
+ 
+@@ -431,7 +431,7 @@
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo()
+ 	throw(::com::sun::star::uno::RuntimeException)
+ {
+-	sal_uInt32 nObjId = (sal_uInt32)mpShape->getPropertyMap();
++	sal_uIntPtr nObjId = (sal_uIntPtr)mpShape->getPropertyMap();
+ 	SfxExtItemPropertySetInfo* pInfo = NULL;
+ 
+ 	SdExtPropertySetInfoCache* pCache = (mpModel && mpModel->IsImpressDocument()) ? 
+Index: binfilter/bf_sd/source/ui/view/sd_frmview.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sd/source/ui/view/sd_frmview.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sd/source/ui/view/sd_frmview.cxx	8 Sep 2005 01:40:53 -0000	1.6
++++ binfilter/bf_sd/source/ui/view/sd_frmview.cxx	27 Apr 2006 16:05:09 -0000	1.6.70.1
+@@ -321,7 +321,7 @@
+ 
+ /*N*/ SvStream& operator << (SvStream& rOut, const FrameView& rView)
+ /*N*/ {
+-/*N*/ 	ULONG nULTemp;
++/*N*/ 	sal_uInt32 nULTemp;
+ /*N*/ 
+ /*N*/ 	// #95895# translate view-layer name to standard-ASCII
+ /*N*/ 	// like in MakeUniqueLayerNames()
+@@ -384,9 +384,9 @@
+ /*N*/ 	rOut << rView.bNoColors;
+ /*N*/ 	rOut << rView.bNoAttribs;
+ /*N*/ 	rOut << rView.aVisArea;
+-/*N*/ 	nULTemp = (ULONG) rView.ePageKind;            rOut << nULTemp;
++/*N*/ 	nULTemp = (sal_uInt32) rView.ePageKind;            rOut << nULTemp;
+ /*N*/ 	rOut << rView.nSelectedPage;
+-/*N*/ 	nULTemp = (ULONG) rView.eStandardEditMode;    rOut << nULTemp;
++/*N*/ 	nULTemp = (sal_uInt32) rView.eStandardEditMode;    rOut << nULTemp;
+ /*N*/ 	rOut << rView.bLayerMode;
+ /*N*/ 	rOut << rView.bQuickEdit;
+ /*N*/ 	rOut << rView.bDragWithCopy;
+@@ -396,11 +396,11 @@
+ /*N*/ 	rOut << rView.bDoubleClickTextEdit;
+ /*N*/ 	rOut << rView.bClickChangeRotation;
+ /*N*/ 
+-/*N*/ 	nULTemp = (ULONG) rView.eNotesEditMode;       rOut << nULTemp;
+-/*N*/ 	nULTemp = (ULONG) rView.eHandoutEditMode;     rOut << nULTemp;
++/*N*/ 	nULTemp = (sal_uInt32) rView.eNotesEditMode;       rOut << nULTemp;
++/*N*/ 	nULTemp = (sal_uInt32) rView.eHandoutEditMode;     rOut << nULTemp;
+ /*N*/ 
+-/*N*/ 	rOut << rView.nDrawMode;
+-/*N*/ 	rOut << rView.nPreviewDrawMode;
++/*N*/ 	rOut << static_cast<sal_uInt32>(rView.nDrawMode);
++/*N*/ 	rOut << static_cast<sal_uInt32>(rView.nPreviewDrawMode);
+ /*N*/ 
+ /*N*/ 	rOut << rView.bShowPreviewInPageMode;
+ /*N*/ 	rOut << rView.bShowPreviewInMasterPageMode;
+@@ -443,7 +443,7 @@
+ /*N*/ 
+ /*N*/ 	if (aIO.GetVersion() >= 3)
+ /*N*/ 	{
+-/*N*/ 		ULONG nULTemp;
++/*N*/ 		sal_uInt32 nULTemp;
+ /*N*/ 		rIn >> rView.aVisArea;
+ /*N*/ 		rIn >> nULTemp;          rView.ePageKind = (PageKind) nULTemp;
+ /*N*/ 		rIn >> rView.nSelectedPage;
+@@ -478,15 +478,18 @@
+ /*N*/ 
+ /*N*/ 	if (aIO.GetVersion() >= 8)
+ /*N*/ 	{
+-/*N*/ 		ULONG nULTemp;
++/*N*/ 		sal_uInt32 nULTemp;
+ /*N*/ 		rIn >> nULTemp; rView.eNotesEditMode   = (EditMode) nULTemp;
+ /*N*/ 		rIn >> nULTemp; rView.eHandoutEditMode = (EditMode) nULTemp;
+ /*N*/ 	}
+ /*N*/ 
+ /*N*/ 	if (aIO.GetVersion() >= 9)
+ /*N*/ 	{
+-/*N*/ 		rIn >> rView.nDrawMode;
+-/*N*/ 		rIn >> rView.nPreviewDrawMode;
++/*N*/ 		sal_uInt32 nTemp;
++/*N*/ 		rIn >> nTemp;
++/*N*/ 		rView.nDrawMode = nTemp;
++/*N*/ 		rIn >> nTemp;
++/*N*/ 		rView.nPreviewDrawMode = nTemp;
+ /*N*/ 	}
+ /*N*/ 
+ /*N*/ 	if (aIO.GetVersion() >= 10)
+Index: binfilter/bf_sfx2/source/appl/sfx2_sfxpicklist.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/appl/sfx2_sfxpicklist.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.70.1
+diff -u -r1.4 -r1.4.70.1
+--- binfilter/bf_sfx2/source/appl/sfx2_sfxpicklist.cxx	8 Sep 2005 02:29:51 -0000	1.4
++++ binfilter/bf_sfx2/source/appl/sfx2_sfxpicklist.cxx	27 Apr 2006 15:24:14 -0000	1.4.70.1
+@@ -219,7 +219,7 @@
+ //STRIP001 		return 0;
+ //STRIP001 }
+ 
+-/*N*/ SfxPickList*	SfxPickList::GetOrCreate( const ULONG nMenuSize )
++/*N*/ SfxPickList*	SfxPickList::GetOrCreate( const sal_uInt32 nMenuSize )
+ /*N*/ {
+ /*N*/ 	if ( !pUniqueInstance )
+ /*N*/ 	{
+Index: binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx,v
+retrieving revision 1.11
+retrieving revision 1.11.68.1
+diff -u -r1.11 -r1.11.68.1
+--- binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx	8 Sep 2005 02:34:30 -0000	1.11
++++ binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx	27 Apr 2006 14:16:34 -0000	1.11.68.1
+@@ -380,7 +380,7 @@
+ 
+ //----------------------------------------------------------------
+ 
+-/*?*/ sal_uInt32 SfxFilterContainer::Execute( SfxMedium& rMedium, SfxFrame*& pFrame) const
++/*?*/ ULONG SfxFilterContainer::Execute( SfxMedium& rMedium, SfxFrame*& pFrame) const
+ /*?*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 
+ //STRIP001 	return ERRCODE_ABORT;
+ /*?*/ }
+@@ -476,7 +476,7 @@
+ 	 Ermitelt einen Filter nach seiner ClipboardID. Diese steckt im Storage.
+  */
+ /*N*/ IMPL_CONTAINER_LOOP(
+-/*N*/     GetFilter4ClipBoardId, sal_uInt32, aArg && pFilter->GetFormat() == aArg )
++/*N*/     GetFilter4ClipBoardId, ULONG, aArg && pFilter->GetFormat() == aArg )
+ 
+ #ifdef MAC
+ #define CONDITION \
+@@ -570,7 +570,7 @@
+ 
+ //-------------------------------------------------------------------------
+ 
+-/*?*/ sal_uInt32 SfxFilterContainer::GetFilter4Content(
++/*?*/ ULONG SfxFilterContainer::GetFilter4Content(
+ /*?*/     SfxMedium& rMedium, const SfxFilter** ppFilter,
+ /*?*/ 	SfxFilterFlags, SfxFilterFlags ) const
+ /*?*/ {
+@@ -690,7 +690,7 @@
+ 
+ //----------------------------------------------------------------
+ 
+-/*N*/ sal_uInt32 SfxFactoryFilterContainer::GetFilter4Content(
++/*N*/ ULONG SfxFactoryFilterContainer::GetFilter4Content(
+ /*N*/     SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
+ /*N*/ {
+ /*N*/ 	SFX_ITEMSET_ARG( rMedium.GetItemSet(), pTargetItem, SfxStringItem,
+@@ -701,7 +701,7 @@
+ /*N*/ 
+ /*N*/     if( pFunc )
+ /*N*/     {
+-/*N*/         sal_uInt32 nErr = (*pFunc)(rMedium, ppFilter, nMust, nDont);
++/*N*/         ULONG nErr = (*pFunc)(rMedium, ppFilter, nMust, nDont);
+ /*N*/         DBG_ASSERT( !*ppFilter ||
+ /*N*/                     (((*ppFilter)->GetFilterFlags() & nMust ) == nMust &&
+ /*N*/                      ((*ppFilter)->GetFilterFlags() & nDont ) == 0 ),
+@@ -803,12 +803,12 @@
+ 
+ //----------------------------------------------------------------
+ 
+-/*N*/ sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
++/*N*/ ULONG SfxFilterMatcher::GuessFilterIgnoringContent(
+ /*N*/     SfxMedium& rMedium, const SfxFilter**ppFilter,
+ /*N*/     SfxFilterFlags nMust, SfxFilterFlags nDont ) const
+ /*N*/ {
+ /*N*/     String aFileName = rMedium.GetName();
+-/*N*/     sal_uInt32 nErr = ERRCODE_NONE;
++/*N*/     ULONG nErr = ERRCODE_NONE;
+ /*N*/ 	const SfxFilter* pFilter = *ppFilter;
+ /*N*/ 	const INetURLObject& rObj = rMedium.GetURLObject();
+ /*N*/ 
+@@ -924,7 +924,7 @@
+ 
+ //----------------------------------------------------------------
+ 
+-/*N*/ sal_uInt32  SfxFilterMatcher::GuessFilter(
++/*N*/ ULONG SfxFilterMatcher::GuessFilter(
+ /*N*/     SfxMedium& rMedium, const SfxFilter**ppFilter,
+ /*N*/     SfxFilterFlags nMust, SfxFilterFlags nDont ) const
+ /*N*/ {
+@@ -1274,10 +1274,10 @@
+ 
+ //----------------------------------------------------------------
+ 
+-/*STRIP003*/ sal_uInt32 SfxFilterMatcher::GetFilter4Content(
++/*STRIP003*/ ULONG SfxFilterMatcher::GetFilter4Content(
+ /*STRIP003*/     SfxMedium& rMedium, const SfxFilter** ppFilter,  SfxFilterFlags nMust, SfxFilterFlags nDont, sal_Bool bOnlyGoodOnes ) const
+ /*STRIP003*/ {
+-/*STRIP003*/     sal_uInt32 nErr = ERRCODE_NONE;
++/*STRIP003*/     ULONG nErr = ERRCODE_NONE;
+ /*STRIP003*/     SfxFContainerList_Impl& rList = pImpl->aList;
+ /*STRIP003*/     sal_uInt16 nCount = (sal_uInt16)rList.Count();
+ /*STRIP003*/     for( sal_uInt16 n = 0; n<nCount; n++ )
+@@ -1327,7 +1327,7 @@
+ /*N*/ IMPL_LOOP( GetFilter4EA, const String& )
+ /*N*/ IMPL_LOOP( GetFilter4Extension, const String& )
+ /*N*/ IMPL_LOOP( GetFilter4Protocol, SfxMedium& )
+-/*N*/ IMPL_LOOP( GetFilter4ClipBoardId, sal_uInt32 )
++/*N*/ IMPL_LOOP( GetFilter4ClipBoardId, ULONG )
+ /*N*/ IMPL_LOOP( GetFilter, const String& )
+ /*N*/ IMPL_LOOP( GetFilter4FilterName, const String& )
+ //STRIP001 IMPL_LOOP( GetFilter4UIName, const String& )
+Index: binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx	8 Sep 2005 03:09:37 -0000	1.7
++++ binfilter/bf_sfx2/source/doc/sfx2_docfac.cxx	27 Apr 2006 15:36:34 -0000	1.7.70.1
+@@ -168,7 +168,7 @@
+ /*?*/ 	const String&   	rName,          // Klartext-Name f"ur Anzeige im Dialog
+ /*?*/ 	const String&       rWildcard,      // Default-Wildcards
+ /*?*/ 	SfxFilterFlags      eType,          // SFX_FILTER_...
+-/*?*/ 	sal_uInt32               lFormat,        // Clipboard-Format
++/*?*/ 	ULONG lFormat,        // Clipboard-Format
+ /*?*/ 	const String&       rMacType,       // 4-Byte-Type f"ur Apple Macintosh
+ /*?*/ 	const String&       rTypeName,      // String-Type f"ur OS/2
+ /*?*/ 	sal_uInt16              nIconId,        // Resource-Id f"ur Icon
+Index: binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx	8 Sep 2005 03:10:05 -0000	1.6
++++ binfilter/bf_sfx2/source/doc/sfx2_docfilt.cxx	27 Apr 2006 15:36:34 -0000	1.6.70.1
+@@ -92,7 +92,7 @@
+ /*N*/ SfxFilter::SfxFilter(  const String &rName,
+ /*N*/ 					   const String &rWildCard,
+ /*N*/ 					   SfxFilterFlags nType,
+-/*N*/ 					   sal_uInt32 lFmt,
++/*N*/ 					   ULONG lFmt,
+ /*N*/ 					   const String &rMacTyp,
+ /*N*/ 					   const String &rTypNm,
+ /*N*/ 					   sal_uInt16 nIcon,
+Index: binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx	8 Sep 2005 03:10:21 -0000	1.5
++++ binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx	27 Apr 2006 15:36:34 -0000	1.5.72.1
+@@ -353,11 +353,11 @@
+ /*N*/ 				   60* aDateTime.GetMin() +
+ /*N*/ 				   60L*60* aDateTime.GetHour() ));
+ /*N*/ 
+-/*N*/ 	BigInt aUlongMax((ULONG)ULONG_MAX);
++/*N*/ 	BigInt aUlongMax(SAL_MAX_UINT32);
+ /*N*/ 	aUlongMax += 1;
+ /*N*/ 
+-/*N*/ 	rStream<<(UINT32)(aTime % aUlongMax) ;
+-/*N*/ 	rStream<<(UINT32)(aTime / aUlongMax);
++/*N*/ 	rStream<<rStream<<static_cast<sal_uInt32>(static_cast<ULONG>(aTime % aUlongMax));
++/*N*/ 	rStream<<rStream<<static_cast<sal_uInt32>(static_cast<ULONG>(aTime / aUlongMax));
+ /*N*/ 	return rStream.GetErrorCode();
+ /*N*/ }
+ 
+@@ -368,7 +368,7 @@
+ /*N*/ 	UINT32 nLow, nHigh;
+ /*N*/ 	rStream >> nLow;
+ /*N*/ 	rStream >> nHigh;
+-/*N*/ 	BigInt aUlongMax( (ULONG)ULONG_MAX );
++/*N*/ 	BigInt aUlongMax( SAL_MAX_UINT32 );
+ /*N*/ 	aUlongMax += 1;
+ /*N*/ 	BigInt aTime = aUlongMax * BigInt( nHigh );
+ /*N*/ 	aTime += nLow;
+Index: binfilter/bf_sfx2/source/inc/sfxpicklist.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sfx2/source/inc/sfxpicklist.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_sfx2/source/inc/sfxpicklist.hxx	8 Sep 2005 03:34:48 -0000	1.4
++++ binfilter/bf_sfx2/source/inc/sfxpicklist.hxx	27 Apr 2006 15:24:21 -0000	1.4.72.1
+@@ -81,7 +81,7 @@
+ 	sal_uInt32						m_nAllowedMenuSize;
+ 	::com::sun::star::uno::Reference< ::com::sun::star::util::XStringWidth > m_xStringLength;
+ 
+-							SfxPickList( ULONG nMenuSize );
++							SfxPickList( sal_uInt32 nMenuSize );
+ //STRIP001 							~SfxPickList();
+ 
+ 	static osl::Mutex*		GetOrCreateMutex();
+@@ -92,7 +92,7 @@
+ //STRIP001 	void					RemovePickListEntries();
+ 
+ 	public:
+-		static SfxPickList*	GetOrCreate( const ULONG nMenuSize );
++		static SfxPickList*	GetOrCreate( const sal_uInt32 nMenuSize );
+ //STRIP001 		static SfxPickList*	Get();
+ //STRIP001 		static void			Delete();
+ 
+Index: binfilter/bf_starmath/source/starmath_document.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_starmath/source/starmath_document.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_starmath/source/starmath_document.cxx	8 Sep 2005 04:01:52 -0000	1.8
++++ binfilter/bf_starmath/source/starmath_document.cxx	27 Apr 2006 14:00:41 -0000	1.8.70.1
+@@ -1813,9 +1813,9 @@
+ /*N*/ 	{
+ /*N*/ 		SvStream*	 pSvStream = aTempStream;
+ /*N*/ 		char		 cTag;
+-/*N*/ 		ULONG		 lIdent, lVersion;
++/*N*/ 		sal_uInt32	 lIdent, lVersion;
+ /*N*/ 		long		 lTime;
+-/*N*/ 		ULONG		 lDate;
++/*N*/ 		sal_uInt32	 lDate;
+ /*N*/ 		String		 aBuffer;
+ /*N*/         ByteString   aByteStr;
+ /*N*/
+@@ -1914,9 +1914,9 @@
+ 
+         SvStream*    pSvStream = aTempStream;
+         char         cTag;
+-        ULONG        lIdent, lVersion;
++        sal_uInt32   lIdent, lVersion;
+         long         lTime;
+-        ULONG        lDate;
++        sal_uInt32   lDate;
+         UINT32       lDataSize;
+         String       aBuffer;
+         ByteString   aByteStr;
+Index: binfilter/bf_starmath/source/starmath_parse.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_starmath/source/starmath_parse.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.24.1
+diff -u -r1.8 -r1.8.24.1
+--- binfilter/bf_starmath/source/starmath_parse.cxx	7 Mar 2006 10:13:24 -0000	1.8
++++ binfilter/bf_starmath/source/starmath_parse.cxx	27 Apr 2006 14:00:41 -0000	1.8.24.1
+@@ -594,7 +594,7 @@
+ /*N*/ 	}
+ /*N*/ 	else if (aRes.TokenType & KParseType::BOOLEAN)
+ /*N*/ 	{
+-/*N*/ 		long   &rnEndPos = aRes.EndPos;
++/*N*/ 		sal_Int32   &rnEndPos = aRes.EndPos;
+ /*N*/ 		String	aName( BufferString.Copy( nRealStart, rnEndPos - nRealStart ) );
+ /*N*/ 		if (2 >= aName.Len())
+ /*N*/ 		{
+@@ -698,7 +698,7 @@
+ /*N*/ 	}
+ /*N*/ 	else if (aRes.TokenType & KParseType::ONE_SINGLE_CHAR)
+ /*N*/ 	{
+-/*N*/ 		long   &rnEndPos = aRes.EndPos;
++/*N*/ 		sal_Int32 &rnEndPos = aRes.EndPos;
+ /*N*/ 		String	aName( BufferString.Copy( nRealStart, rnEndPos - nRealStart ) );
+ /*N*/ 
+ /*N*/ 		if (1 == aName.Len())
+Index: binfilter/bf_starmath/source/starmath_utility.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_starmath/source/starmath_utility.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_starmath/source/starmath_utility.cxx	8 Sep 2005 04:07:16 -0000	1.7
++++ binfilter/bf_starmath/source/starmath_utility.cxx	27 Apr 2006 14:00:41 -0000	1.7.70.1
+@@ -78,17 +78,17 @@
+ /*N*/ SvStream& operator << (SvStream& rStream, const SmFace& rFont)
+ /*N*/ {
+ /*N*/ 	rStream.WriteByteString(ExportString(rFont.GetName()));
+-/*N*/ 	rStream << (ULONG)rFont.GetFamily();
+-/*N*/     rStream << (ULONG)GetSOStoreTextEncoding( rFont.GetCharSet() );
+-/*N*/ 	rStream << (ULONG)rFont.GetWeight();
+-/*N*/ 	rStream << (ULONG)rFont.GetItalic();
++/*N*/ 	rStream << (sal_uInt32)rFont.GetFamily();
++/*N*/     rStream << (sal_uInt32)GetSOStoreTextEncoding( rFont.GetCharSet() );
++/*N*/ 	rStream << (sal_uInt32)rFont.GetWeight();
++/*N*/ 	rStream << (sal_uInt32)rFont.GetItalic();
+ /*N*/ 
+ /*N*/ 	return rStream;
+ /*N*/ }
+ 
+ /*N*/ SvStream& operator >> (SvStream& rStream, SmFace& rFont)
+ /*N*/ {
+-/*N*/ 	ULONG	nData;
++/*N*/ 	sal_uInt32 nData;
+ /*N*/     ByteString  aByteStr;
+ /*N*/ 
+ /*N*/     rStream.ReadByteString( aByteStr );
+@@ -108,7 +108,7 @@
+ /*?*/ void ReadSM20Font(SvStream& rStream, Font& rFont)
+ /*?*/ {
+ /*?*/ 	BOOL	bData;
+-/*?*/ 	ULONG	nData;
++/*?*/ 	sal_uInt32 nData;
+ /*?*/     ByteString  aByteStr;
+ /*?*/ 
+ /*?*/     rStream.ReadByteString( aByteStr );
+Index: binfilter/bf_svx/source/editeng/editdoc.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/editdoc.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_svx/source/editeng/editdoc.hxx	8 Sep 2005 05:17:39 -0000	1.4
++++ binfilter/bf_svx/source/editeng/editdoc.hxx	27 Apr 2006 12:26:03 -0000	1.4.72.1
+@@ -459,7 +459,7 @@
+ 
+ class ParaPortion;
+ 
+-SV_DECL_VARARR( CharPosArray, long, 0, CHARPOSGROW )//STRIP008 ;
++SV_DECL_VARARR( CharPosArray, sal_Int32, 0, CHARPOSGROW )//STRIP008 ;
+ 
+ // ------------------------------------------------------------------------
+ // class EditLine
+Index: binfilter/bf_svx/source/editeng/editobj2.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/editobj2.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/bf_svx/source/editeng/editobj2.hxx	8 Sep 2005 05:18:17 -0000	1.3
++++ binfilter/bf_svx/source/editeng/editobj2.hxx	27 Apr 2006 12:16:58 -0000	1.3.70.1
+@@ -193,7 +193,7 @@
+ 	BOOL					bOwnerOfPool;
+ 	XParaPortionList*		pPortionInfo;
+ 	
+-	ULONG					nObjSettings;
++	sal_uInt32				nObjSettings;
+ 	USHORT 					nMetric;
+ 	USHORT 					nVersion;
+ 	USHORT					nUserType;
+Index: binfilter/bf_svx/source/editeng/impedit.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/impedit.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_svx/source/editeng/impedit.hxx	8 Sep 2005 05:20:38 -0000	1.5
++++ binfilter/bf_svx/source/editeng/impedit.hxx	27 Apr 2006 12:10:21 -0000	1.5.72.1
+@@ -248,7 +248,7 @@
+ 
+ 
+ 	long				nInvMore;
+-	sal_uInt32			nControl;
++	ULONG				nControl;
+ 	sal_uInt32			nTravelXPos;
+     sal_uInt16          nExtraCursorFlags;
+     sal_uInt16          nCursorBidiLevel;
+Index: binfilter/bf_svx/source/editeng/svx_editdoc2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_editdoc2.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_svx/source/editeng/svx_editdoc2.cxx	8 Sep 2005 05:22:41 -0000	1.6
++++ binfilter/bf_svx/source/editeng/svx_editdoc2.cxx	27 Apr 2006 12:26:03 -0000	1.6.70.1
+@@ -94,7 +94,7 @@
+ 
+ /*N*/ DBG_NAME( EE_ParaPortion )
+ 
+-/*N*/ SV_IMPL_VARARR( CharPosArray, long );
++/*N*/ SV_IMPL_VARARR( CharPosArray, sal_Int32 );
+ 
+ /*
+ 
+Index: binfilter/bf_svx/source/editeng/svx_editeng.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_editeng.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.2
+diff -u -r1.7 -r1.7.70.2
+--- binfilter/bf_svx/source/editeng/svx_editeng.cxx	8 Sep 2005 05:22:56 -0000	1.7
++++ binfilter/bf_svx/source/editeng/svx_editeng.cxx	27 Apr 2006 12:26:03 -0000	1.7.70.2
+@@ -1256,7 +1256,7 @@
+ /*N*/ 		pImpEditEngine->FormatAndUpdate();
+ /*N*/ }
+ 
+-/*N*/ sal_uInt32 EditEngine::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
++/*N*/ ULONG EditEngine::Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs /* = NULL */ )
+ /*N*/ {DBG_BF_ASSERT(0, "STRIP");return 0; //STRIP001 
+ //STRIP001 	DBG_CHKTHIS( EditEngine, 0 );
+ //STRIP001 	sal_Bool bUndoEnabled = pImpEditEngine->IsUndoEnabled();
+@@ -1269,7 +1269,7 @@
+ /*N*/ }
+ 
+ #ifndef SVX_LIGHT
+-/*N*/ sal_uInt32 EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
++/*N*/ ULONG EditEngine::Write( SvStream& rOutput, EETextFormat eFormat )
+ /*N*/ {DBG_BF_ASSERT(0, "STRIP"); return 0;//STRIP001 
+ //STRIP001 	DBG_CHKTHIS( EditEngine, 0 );
+ //STRIP001 	EditPaM aStartPaM( pImpEditEngine->GetEditDoc().GetStartPaM() );
+@@ -2333,7 +2333,7 @@
+ // =====================================================================
+ // ======================   Virtuelle Methoden   =======================
+ // =====================================================================
+-/*N*/ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT nTextStart, USHORT nTextLen, const long*, const SvxFont&, sal_uInt16 nPara, sal_uInt16 nIndex, BYTE nRightToLeft )
++/*N*/ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT nTextStart, USHORT nTextLen, const sal_Int32*, const SvxFont&, sal_uInt16 nPara, sal_uInt16 nIndex, BYTE nRightToLeft )
+ /*N*/ {
+ /*N*/ 	DBG_CHKTHIS( EditEngine, 0 );
+ /*N*/ }
+Index: binfilter/bf_svx/source/editeng/svx_editobj.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_editobj.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.26.1
+diff -u -r1.8 -r1.8.26.1
+--- binfilter/bf_svx/source/editeng/svx_editobj.cxx	9 Feb 2006 15:09:38 -0000	1.8
++++ binfilter/bf_svx/source/editeng/svx_editobj.cxx	27 Apr 2006 12:16:42 -0000	1.8.26.1
+@@ -483,7 +483,7 @@
+ /*N*/ 	USHORT nWhich = Which();
+ /*N*/ 	rOStream << nWhich;
+ /*N*/ 
+-/*N*/ 	ULONG nStructSz = 0;
++/*N*/ 	sal_uInt32 nStructSz = 0;
+ /*N*/ 	rOStream << nStructSz;
+ /*N*/ 
+ /*N*/ 	// Eigene Daten:
+@@ -507,7 +507,7 @@
+ /*N*/ 	USHORT nWhich;
+ /*N*/ 	rIStream >> nWhich;
+ /*N*/ 
+-/*N*/ 	ULONG nStructSz;
++/*N*/ 	sal_uInt32 nStructSz;
+ /*N*/ 	rIStream >> nStructSz;
+ /*N*/ 
+ /*N*/ 	DBG_ASSERT( ( nWhich == 0x22 /*EE_FORMAT_BIN300*/ ) || ( nWhich == EE_FORMAT_BIN ), "CreateTextObject: Unbekanntes Objekt!" );
+@@ -1842,11 +1842,11 @@
+ /*N*/ 	GetPool()->Load( rIStream );
+ /*N*/ 
+ /*N*/ 	// Die Anzahl der Absaetze...
+-/*N*/ 	ULONG nParagraphs;
++/*N*/ 	sal_uInt32 nParagraphs;
+ /*N*/ 	rIStream >> nParagraphs;
+ /*N*/ 
+ /*N*/ 	// Die einzelnen Absaetze...
+-/*N*/ 	for ( ULONG nPara = 0; nPara < nParagraphs; nPara++ )
++/*N*/ 	for ( sal_uInt32 nPara = 0; nPara < nParagraphs; nPara++ )
+ /*N*/ 	{
+ /*N*/ 		ContentInfo* pC = CreateAndInsertContent();
+ /*N*/ 
+@@ -1863,13 +1863,13 @@
+ /*N*/ 		pC->GetParaAttribs().Load( rIStream );
+ /*N*/ 
+ /*N*/ 		// Die Anzahl der Attribute...
+-/*N*/ 		ULONG nAttribs;
++/*N*/ 		sal_uInt32 nAttribs;
+ /*N*/ 		rIStream >> nAttribs;
+ /*N*/ 
+ /*N*/ 		// Und die einzelnen Attribute
+ /*N*/ 		// Items als Surregate => immer 8 Byte pro Attrib
+ /*N*/ 		// Which = 2; Surregat = 2; Start = 2; End = 2;
+-/*N*/ 		for ( ULONG nAttr = 0; nAttr < nAttribs; nAttr++ )
++/*N*/ 		for ( sal_uInt32 nAttr = 0; nAttr < nAttribs; nAttr++ )
+ /*N*/ 		{
+ /*N*/ 			USHORT nWhich, nStart, nEnd;
+ /*N*/ 			const SfxPoolItem* pItem;
+Index: binfilter/bf_svx/source/editeng/svx_impedit2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_impedit2.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_svx/source/editeng/svx_impedit2.cxx	8 Sep 2005 05:26:27 -0000	1.7
++++ binfilter/bf_svx/source/editeng/svx_impedit2.cxx	27 Apr 2006 12:19:11 -0000	1.7.70.1
+@@ -2786,14 +2786,14 @@
+ /*?*/ 	return aPaM;
+ /*N*/ }
+ 
+-/*N*/ ULONG ImpEditEngine::GetTextHeight() const
++/*N*/ sal_uInt32 ImpEditEngine::GetTextHeight() const
+ /*N*/ {
+ /*N*/ 	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" );
+ /*N*/ 	DBG_ASSERT( IsFormatted() || IsFormatting(), "GetTextHeight: Nicht formatiert" );
+ /*N*/ 	return nCurTextHeight;
+ /*N*/ }
+ 
+-/*N*/ ULONG ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
++/*N*/ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace )
+ /*N*/ {
+ /*N*/ 	// Wenn noch nicht formatiert und nicht gerade dabei.
+ /*N*/ 	// Wird in der Formatierung bei AutoPageSize gerufen.
+@@ -2856,10 +2856,10 @@
+ /*?*/ 		nMaxWidth = 0;
+ /*N*/ 
+ /*N*/ 	nMaxWidth++; // Ein breiter, da in CreateLines bei >= umgebrochen wird.
+-/*N*/ 	return (ULONG)nMaxWidth;
++/*N*/ 	return (sal_uInt32)nMaxWidth;
+ /*N*/ }
+ 
+-/*N*/ ULONG ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
++/*N*/ sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace )
+ /*N*/ {
+ /*N*/ 	USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() );
+ /*N*/     ULONG nOldLayoutMode = GetRefDevice()->GetLayoutMode();
+@@ -2869,7 +2869,7 @@
+ /*N*/     SvxAdjust eJustification = GetJustification( nPara );
+ /*N*/ 
+ /*N*/     // Berechnung der Breite ohne die Indents...
+-/*N*/ 	ULONG nWidth = 0;
++/*N*/ 	sal_uInt32 nWidth = 0;
+ /*N*/     USHORT nPos = pLine->GetStart();
+ /*N*/ 	for ( USHORT nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ )
+ /*N*/ 	{
+@@ -2907,10 +2907,10 @@
+ /*N*/     return nWidth;
+ /*N*/ }
+ 
+-/*N*/ ULONG ImpEditEngine::CalcTextHeight()
++/*N*/ sal_uInt32 ImpEditEngine::CalcTextHeight()
+ /*N*/ {
+ /*N*/ 	DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" );
+-/*N*/ 	ULONG nY = 0;
++/*N*/ 	sal_uInt32 nY = 0;
+ /*N*/ 	for ( USHORT nPortion = 0; nPortion < GetParaPortions().Count(); nPortion++ )
+ /*N*/ 		nY += GetParaPortions()[nPortion]->GetHeight();
+ /*N*/ 	return nY;
+Index: binfilter/bf_svx/source/editeng/svx_impedit3.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_impedit3.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.40.1
+diff -u -r1.8 -r1.8.40.1
+--- binfilter/bf_svx/source/editeng/svx_impedit3.cxx	19 Jan 2006 17:28:27 -0000	1.8
++++ binfilter/bf_svx/source/editeng/svx_impedit3.cxx	27 Apr 2006 12:26:03 -0000	1.8.40.1
+@@ -777,7 +777,7 @@
+ /*N*/ 	SvxFont aTmpFont( pNode->GetCharAttribs().GetDefFont() );
+ /*N*/ 
+ /*N*/ 	sal_Bool bCalcCharPositions = sal_True;
+-/*N*/ 	long* pBuf = new long[ pNode->Len() ];
++/*N*/ 	sal_Int32* pBuf = new sal_Int32[ pNode->Len() ];
+ /*N*/ 
+ /*N*/ 	sal_Bool bSameLineAgain = sal_False;	// Fuer TextRanger, wenn sich die Hoehe aendert.
+ /*N*/ 	TabInfo aCurrentTab;
+@@ -2932,8 +2932,8 @@
+ /*N*/ 								XubString aText;
+ /*N*/                                 USHORT nTextStart = 0;
+ /*N*/                                 USHORT nTextLen = 0;
+-/*N*/ 								const long* pDXArray = 0;
+-/*N*/ 								long* pTmpDXArray = 0;
++/*N*/ 								const sal_Int32* pDXArray = 0;
++/*N*/ 								sal_Int32* pTmpDXArray = 0;
+ /*N*/ 
+ /*N*/ 								if ( pTextPortion->GetKind() == PORTIONKIND_TEXT )
+ /*N*/ 								{
+@@ -2951,7 +2951,7 @@
+ /*?*/                                     nTextStart = 0;
+ /*?*/                                     nTextLen = aText.Len();
+ /*?*/ 
+-/*?*/ 									pTmpDXArray = new long[ aText.Len() ];
++/*?*/ 									pTmpDXArray = new sal_Int32[ aText.Len() ];
+ /*?*/ 									pDXArray = pTmpDXArray;
+ /*?*/ 									Font aOldFont( GetRefDevice()->GetFont() );
+ /*?*/ 									aTmpFont.SetPhysFont( GetRefDevice() );
+Index: binfilter/bf_svx/source/editeng/svx_impedit4.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/editeng/svx_impedit4.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.72.1
+diff -u -r1.7 -r1.7.72.1
+--- binfilter/bf_svx/source/editeng/svx_impedit4.cxx	8 Sep 2005 05:27:00 -0000	1.7
++++ binfilter/bf_svx/source/editeng/svx_impedit4.cxx	27 Apr 2006 12:26:03 -0000	1.7.72.1
+@@ -1284,7 +1284,7 @@
+ /*N*/ 	if ( pPortionInfo && ( (long)pPortionInfo->GetPaperWidth() == aPaperSize.Width() )
+ /*N*/ 			&& ( pPortionInfo->GetRefMapMode() == GetRefDevice()->GetMapMode() ) )
+ /*N*/ 	{
+-/*?*/ 		if ( ( pPortionInfo->GetRefDevPtr() == (sal_uInt32)GetRefDevice() ) ||
++/*?*/ 		if ( ( pPortionInfo->GetRefDevPtr() == (sal_uIntPtr)GetRefDevice() ) ||
+ /*?*/ 			 ( ( pPortionInfo->GetRefDevType() == OUTDEV_VIRDEV ) &&
+ /*?*/ 			   ( GetRefDevice()->GetOutDevType() == OUTDEV_VIRDEV ) ) )
+ /*?*/ 		bUsePortionInfo = sal_True;
+Index: binfilter/bf_svx/source/items/svx_flditem.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_flditem.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.10.1
+diff -u -r1.9 -r1.9.10.1
+--- binfilter/bf_svx/source/items/svx_flditem.cxx	7 Apr 2006 13:26:42 -0000	1.9
++++ binfilter/bf_svx/source/items/svx_flditem.cxx	27 Apr 2006 10:24:29 -0000	1.9.10.1
+@@ -80,7 +80,7 @@
+ #include "so3/staticbaseurl.hxx"
+ namespace binfilter {
+ 
+-#define FRAME_MARKER	(ULONG)0x21981357
++#define FRAME_MARKER	(sal_uInt32)0x21981357
+ #define CHARSET_MARKER	(FRAME_MARKER+1)
+ 
+ // -----------------------------------------------------------------------
+@@ -415,7 +415,7 @@
+ /*N*/ void SvxURLField::Load( SvPersistStream & rStm )
+ /*N*/ {
+ /*N*/ 	USHORT nFormat;
+-/*N*/ 	ULONG nFrameMarker, nCharSetMarker;
++/*N*/ 	sal_uInt32 nFrameMarker, nCharSetMarker;
+ /*N*/ 	long nUlongSize = (long)sizeof(ULONG);
+ /*N*/ 	String aTmpURL;
+ /*N*/ 
+@@ -696,7 +696,7 @@
+ /*N*/         break;
+ /*N*/ 	}
+ /*N*/ 
+-/*N*/     ULONG nFormatKey;
++/*N*/     sal_uInt32 nFormatKey;
+ /*N*/ 
+ /*N*/ 	switch( eTmpFormat )
+ /*N*/ 	{
+Index: binfilter/bf_svx/source/items/svx_frmitems.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_frmitems.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.38.1
+diff -u -r1.7 -r1.7.38.1
+--- binfilter/bf_svx/source/items/svx_frmitems.cxx	20 Jan 2006 11:38:46 -0000	1.7
++++ binfilter/bf_svx/source/items/svx_frmitems.cxx	27 Apr 2006 10:19:20 -0000	1.7.38.1
+@@ -505,8 +505,8 @@
+ 
+ // -----------------------------------------------------------------------
+ 
+-/*N*/ SvxLRSpaceItem::SvxLRSpaceItem( const sal_Int32 nLeft, const sal_Int32 nRight,
+-/*N*/ 								const sal_Int32 nTLeft, const short nOfset,
++/*N*/ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
++/*N*/ 								const long nTLeft, const short nOfset,
+ /*N*/ 								const sal_uInt16 nId ) :
+ /*N*/ 
+ /*N*/ 	SfxPoolItem( nId ),
+Index: binfilter/bf_svx/source/items/svx_svxfont.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_svxfont.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/items/svx_svxfont.cxx	8 Sep 2005 06:20:45 -0000	1.6
++++ binfilter/bf_svx/source/items/svx_svxfont.cxx	27 Apr 2006 10:27:41 -0000	1.6.72.1
+@@ -478,7 +478,7 @@
+ /*N*/ }
+ 
+ /*N*/ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt,
+-/*N*/ 						 const USHORT nIdx, const USHORT nLen, long* pDXArray ) const
++/*N*/ 						 const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray ) const
+ /*N*/ {
+ /*N*/ 	if ( !IsCaseMap() && !IsKern() )
+ /*N*/ 		return Size( pOut->GetTextArray( rTxt, pDXArray, nIdx, nLen ),
+@@ -565,7 +565,7 @@
+ 
+ /*N*/ void SvxFont::QuickDrawText( OutputDevice *pOut,
+ /*N*/ 	const Point &rPos, const XubString &rTxt,
+-/*N*/ 	const xub_StrLen nIdx, const xub_StrLen nLen, const long* pDXArray ) const
++/*N*/ 	const xub_StrLen nIdx, const xub_StrLen nLen, const sal_Int32* pDXArray ) const
+ /*N*/ {
+ /*N*/ 	// Font muss ins OutputDevice selektiert sein...
+ /*N*/ 	if ( !IsCaseMap() && !IsCapital() && !IsKern() && !IsEsc() )
+Index: binfilter/bf_svx/source/items/svx_textitem.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/items/svx_textitem.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.10.1
+diff -u -r1.8 -r1.8.10.1
+--- binfilter/bf_svx/source/items/svx_textitem.cxx	7 Apr 2006 13:27:19 -0000	1.8
++++ binfilter/bf_svx/source/items/svx_textitem.cxx	27 Apr 2006 10:29:34 -0000	1.8.10.1
+@@ -464,7 +464,7 @@
+ /*N*/     // #96441# Kach for EditEngine, only set while creating clipboard stream.
+ /*N*/     if ( bEnableStoreUnicodeNames )
+ /*N*/     {
+-/*N*/         ULONG nMagic = STORE_UNICODE_MAGIC_MARKER;
++/*N*/         sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
+ /*N*/         rStrm << nMagic;
+ /*N*/         rStrm.WriteByteString( aStoreFamilyName, RTL_TEXTENCODING_UNICODE );
+ /*N*/ 	    rStrm.WriteByteString( GetStyleName(), RTL_TEXTENCODING_UNICODE );
+@@ -498,7 +498,7 @@
+ /*N*/ 
+ /*N*/     // Check if we have stored unicode
+ /*N*/     ULONG nStreamPos = rStrm.Tell();
+-/*N*/     ULONG nMagic = STORE_UNICODE_MAGIC_MARKER;
++/*N*/     sal_uInt32 nMagic = STORE_UNICODE_MAGIC_MARKER;
+ /*N*/     rStrm >> nMagic;
+ /*N*/     if ( nMagic == STORE_UNICODE_MAGIC_MARKER )
+ /*N*/     {
+Index: binfilter/bf_svx/source/outliner/outleeng.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/outliner/outleeng.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_svx/source/outliner/outleeng.hxx	8 Sep 2005 06:41:59 -0000	1.3
++++ binfilter/bf_svx/source/outliner/outleeng.hxx	28 Apr 2006 08:58:35 -0000	1.3.72.1
+@@ -61,7 +61,7 @@
+ 	virtual void 		ParagraphDeleted( USHORT nDeletedParagraph );
+ 	
+ 	// #101498#
+-	virtual void 		DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft);
++	virtual void 		DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft);
+ 
+ //STRIP001 	virtual	void 		StyleSheetChanged( SfxStyleSheet* pStyle );
+ 	virtual void 		ParaAttribsChanged( USHORT nPara );
+Index: binfilter/bf_svx/source/outliner/svx_outleeng.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/outliner/svx_outleeng.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_svx/source/outliner/svx_outleeng.cxx	8 Sep 2005 06:43:13 -0000	1.4
++++ binfilter/bf_svx/source/outliner/svx_outleeng.cxx	28 Apr 2006 08:58:35 -0000	1.4.72.1
+@@ -149,7 +149,7 @@
+ /*N*/ }
+ 
+ // #101498#
+-/*N*/ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
++/*N*/ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
+ /*N*/ {
+ /*N*/ 	if ( nIndex == 0 )
+ /*N*/ 	{
+Index: binfilter/bf_svx/source/outliner/svx_outliner.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/outliner/svx_outliner.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_svx/source/outliner/svx_outliner.cxx	8 Sep 2005 06:43:46 -0000	1.8
++++ binfilter/bf_svx/source/outliner/svx_outliner.cxx	28 Apr 2006 08:58:36 -0000	1.8.70.1
+@@ -2023,7 +2023,7 @@
+ /*N*/ }
+ 
+ // #101498#
+-/*N*/ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
++/*N*/ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft)
+ /*N*/ {
+ /*N*/ 	DBG_CHKTHIS(Outliner,0);
+ /*N*/ 	
+Index: binfilter/bf_svx/source/outliner/svx_outlobj.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/outliner/svx_outlobj.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/outliner/svx_outlobj.cxx	8 Sep 2005 06:44:14 -0000	1.6
++++ binfilter/bf_svx/source/outliner/svx_outlobj.cxx	28 Apr 2006 08:58:36 -0000	1.6.72.1
+@@ -136,7 +136,7 @@
+ /*N*/ void OutlinerParaObject::Store(SvStream& rStream ) const
+ /*N*/ {
+ /*N*/ 	rStream << nCount;
+-/*N*/ 	rStream << (ULONG) 0x42345678;
++/*N*/ 	rStream << (sal_uInt32) 0x42345678;
+ /*N*/ 	pText->Store( rStream );
+ /*N*/ 
+ /*N*/ 	for( USHORT nPos=0; nPos < nCount; nPos++ )
+@@ -150,10 +150,10 @@
+ /*N*/ 	OutlinerParaObject* pPObj = NULL;
+ /*N*/ 	USHORT nVersion = 0;
+ /*N*/ 
+-/*N*/ 	ULONG nCount;
++/*N*/ 	sal_uInt32 nCount;
+ /*N*/ 	rStream >> nCount;
+ /*N*/ 
+-/*N*/ 	ULONG nSyncRef;
++/*N*/ 	sal_uInt32 nSyncRef;
+ /*N*/ 	rStream >> nSyncRef;
+ /*N*/ 	if( nSyncRef == 0x12345678 )
+ /*N*/ 		nVersion = 1;
+@@ -175,7 +175,7 @@
+ /*N*/ 			{
+ /*N*/ 				EditTextObject* pText = EditTextObject::Create( rStream, NULL );
+ /*N*/ 				DBG_ASSERT(pText,"CreateEditTextObject failed")
+-/*N*/ 				ULONG nSync = 0;
++/*N*/ 				sal_uInt32 nSync = 0;
+ /*N*/ 				rStream >> nSync;
+ /*N*/ 				DBG_ASSERT(nSync==nSyncRef,"Stream out of sync")
+ /*N*/ 				USHORT nDepth;
+@@ -219,7 +219,7 @@
+ /*N*/ 				nCurPara++;
+ /*N*/ 				if( nCount )
+ /*N*/ 				{
+-/*N*/ 					ULONG nSync = 0;
++/*N*/ 					sal_uInt32 nSync = 0;
+ /*N*/ 					rStream >> nSync;
+ /*N*/ 					DBG_ASSERT(nSync==nSyncRef,"Stream out of sync")
+ /*N*/ 				}
+Index: binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx	8 Sep 2005 06:57:34 -0000	1.8
++++ binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx	28 Apr 2006 08:58:36 -0000	1.8.70.1
+@@ -1684,8 +1684,8 @@
+ 
+ /*N*/ void SdrModel::WriteData(SvStream& rOut) const
+ /*N*/ {
+-/*N*/ 	const ULONG nOldCompressMode = nStreamCompressMode;
+-/*N*/ 	ULONG		nNewCompressMode = nStreamCompressMode;
++/*N*/ 	const sal_uInt32 nOldCompressMode = nStreamCompressMode;
++/*N*/ 	sal_uInt32 nNewCompressMode = nStreamCompressMode;
+ /*N*/ 
+ /*N*/ 	if( SOFFICE_FILEFORMAT_40 <= rOut.GetVersion() )
+ /*N*/ 	{
+Index: binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx	8 Sep 2005 06:58:20 -0000	1.5
++++ binfilter/bf_svx/source/svdraw/svx_svdoattr.cxx	28 Apr 2006 08:58:37 -0000	1.5.70.1
+@@ -1084,11 +1084,11 @@
+ /*N*/ 	nSttWdt /= 2;
+ /*N*/ 
+ /*N*/ 	// Lieber etwas mehr, dafuer keine Wurzel ziehen
+-/*N*/ 	long nSttAdd = Max(nSttWdt, nSttHgt);
++/*N*/ 	sal_Int32 nSttAdd = Max(nSttWdt, nSttHgt);
+ /*N*/ 	nSttAdd *= 3;
+ /*N*/ 	nSttAdd /= 2;
+ /*N*/ 
+-/*N*/ 	long nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue();
++/*N*/ 	sal_Int32 nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+ /*N*/ 
+ /*N*/ 	if(nEndWdt < 0)
+ /*N*/ 		nEndWdt = -nLineWdt * nEndWdt / 100; // <0 = relativ
+Index: binfilter/bf_svx/source/svdraw/svx_svdopath.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/svdraw/svx_svdopath.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.68.1
+diff -u -r1.5 -r1.5.68.1
+--- binfilter/bf_svx/source/svdraw/svx_svdopath.cxx	8 Sep 2005 07:01:06 -0000	1.5
++++ binfilter/bf_svx/source/svdraw/svx_svdopath.cxx	28 Apr 2006 08:58:37 -0000	1.5.68.1
+@@ -79,6 +79,8 @@
+ // #104018# replace macros above with type-safe methods
+ inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72); }
+ inline sal_Int32 ImplMMToTwips(sal_Int32 nVal) { return ((nVal * 72 + 63) / 127); }
++inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); }
++inline sal_Int64 ImplMMToTwips(sal_Int64 nVal) { return ((nVal * 72 + 63) / 127); }
+ inline double ImplTwipsToMM(double fVal) { return (fVal * (127.0 / 72.0)); }
+ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
+ 
+Index: binfilter/bf_svx/source/xoutdev/svx__xfont.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/xoutdev/svx__xfont.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/xoutdev/svx__xfont.cxx	8 Sep 2005 07:37:56 -0000	1.6
++++ binfilter/bf_svx/source/xoutdev/svx__xfont.cxx	27 Apr 2006 15:45:25 -0000	1.6.72.1
+@@ -187,7 +187,7 @@
+ 
+ // #101498# Helper method ImpGetTextLength to get text length taking into account
+ // hor/vertical and BIDI, especially right-to-left.
+-/*N*/ sal_Int32 ImpGetTextLength(OutputDevice* pOut, DrawPortionInfo* pInfo, long* pDXArray, 
++/*N*/ sal_Int32 ImpGetTextLength(OutputDevice* pOut, DrawPortionInfo* pInfo, sal_Int32* pDXArray, 
+ /*N*/ 	xub_StrLen nIndex, xub_StrLen nLen)
+ /*N*/ {
+ /*N*/ 	sal_Bool bRightToLeft = pInfo->IsRTL();
+@@ -266,7 +266,7 @@
+ /*N*/ 	sal_Bool bToLastPoint, sal_Bool bDraw, sal_Bool bIsShadow)
+ /*N*/ {
+ /*N*/ 	Font aFont = pInfo->rFont;
+-/*N*/ 	const long* pDXArray = pInfo->pDXArray;
++/*N*/ 	const sal_Int32* pDXArray = pInfo->pDXArray;
+ /*N*/ 	sal_Bool bUseBreakIterator(sal_False);
+ /*N*/ 
+ /*N*/ 	Reference < ::com::sun::star::i18n::XBreakIterator > xBreak;
+@@ -348,7 +348,7 @@
+ /*N*/ 		pDXArray = NULL;
+ /*N*/ 	}
+ /*N*/ 
+-/*N*/ 	nTextWidth = ImpGetTextLength(pOut, pInfo, (long*) pDXArray, 0, pInfo->nTextLen);
++/*N*/ 	nTextWidth = ImpGetTextLength(pOut, pInfo, const_cast<sal_Int32*>(pDXArray), 0, pInfo->nTextLen);
+ /*N*/ 
+ /*N*/ 	if ( eFormTextAdjust != XFT_LEFT && nAbsStart <= 0 )
+ /*N*/ 	{
+@@ -443,7 +443,7 @@
+ /*N*/ 		fLen = sqrt(fDx * fDx + fDy * fDy);
+ /*N*/ 		nLen = (long) (fLen + 0.5);
+ /*N*/ 
+-/*N*/ 		nChar1Len = ImpGetTextLength(pOut, pInfo, (long*) pDXArray, nChar, nGlyphLen);
++/*N*/ 		nChar1Len = ImpGetTextLength(pOut, pInfo, const_cast<sal_Int32*>(pDXArray), nChar, nGlyphLen);
+ /*N*/ 
+ /*N*/ 		double fXDist, fYDist;
+ /*N*/ 		double fCos = fDx;
+@@ -498,7 +498,7 @@
+ /*N*/ 						CharacterIteratorMode::SKIPCELL, 1, nDone) - (nChar + pInfo->nTextStart + nCnt);
+ /*N*/ 				}
+ /*N*/ 
+-/*N*/ 				nTextLen = ImpGetTextLength(pOut, pInfo, (long*) pDXArray, nChar, nCnt + nNextGlyphLen);
++/*N*/ 				nTextLen = ImpGetTextLength(pOut, pInfo, const_cast<sal_Int32*>(pDXArray), nChar, nCnt + nNextGlyphLen);
+ /*N*/ 
+ /*N*/ 				nCnt += nNextGlyphLen;
+ /*N*/ 			}
+@@ -606,7 +606,7 @@
+ /*?*/ 					{
+ /*?*/ 						long nW;
+ /*?*/ 
+-/*?*/ 						nW = ImpGetTextLength(pOut, pInfo, (long*) pDXArray, nChar, i);
++/*?*/ 						nW = ImpGetTextLength(pOut, pInfo, const_cast<sal_Int32*>(pDXArray), nChar, i);
+ /*?*/ 
+ /*?*/ 						aPolyPos.X() += (long) (fDx * nW / fLen);
+ /*?*/ 						aPolyPos.Y() += (long) (fDy * nW / fLen);
+@@ -657,7 +657,7 @@
+ /*?*/ 					{
+ /*?*/ 						long nW;
+ /*?*/ 
+-/*?*/ 						nW = ImpGetTextLength(pOut, pInfo, (long*) pDXArray, nChar + i, nNextGlyphLen);
++/*?*/ 						nW = ImpGetTextLength(pOut, pInfo, const_cast<sal_Int32*>(pDXArray), nChar + i, nNextGlyphLen);
+ /*?*/ 
+ /*?*/ 						aPolyPos.X() -= nW / 2;
+ /*?*/ 
+Index: binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx	8 Sep 2005 07:42:49 -0000	1.6
++++ binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx	27 Apr 2006 15:45:26 -0000	1.6.72.1
+@@ -199,10 +199,10 @@
+ /*N*/ 		XDash& rDash = pEntry->GetDash();
+ /*N*/ 		rOut << (long)rDash.GetDashStyle();
+ /*N*/ 		rOut << (long)rDash.GetDots();
+-/*N*/ 		rOut << rDash.GetDotLen();
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDotLen());
+ /*N*/ 		rOut << (long)rDash.GetDashes();
+-/*N*/ 		rOut << rDash.GetDashLen();
+-/*N*/ 		rOut << rDash.GetDistance();
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDashLen());
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDistance());
+ /*N*/ 		pEntry = (XDashEntry*)aTable.Next();
+ /*N*/ 	}
+ /*N*/ 
+@@ -227,10 +227,10 @@
+ /*N*/ 
+ /*N*/ 	long		nStyle;
+ /*N*/ 	long		nDots;
+-/*N*/ 	ULONG		nDotLen;
++/*N*/ 	sal_uInt32	nDotLen;
+ /*N*/ 	long		nDashes;
+-/*N*/ 	ULONG		nDashLen;
+-/*N*/ 	ULONG		nDistance;
++/*N*/ 	sal_uInt32	nDashLen;
++/*N*/ 	sal_uInt32	nDistance;
+ /*N*/ 
+ /*N*/ 	rIn >> nType;
+ /*N*/ 
+@@ -546,10 +546,10 @@
+ /*N*/ 		XDash& rDash = pEntry->GetDash();
+ /*N*/ 		rOut << (long)rDash.GetDashStyle();
+ /*N*/ 		rOut << (long)rDash.GetDots();
+-/*N*/ 		rOut << rDash.GetDotLen();
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDotLen());
+ /*N*/ 		rOut << (long)rDash.GetDashes();
+-/*N*/ 		rOut << rDash.GetDashLen();
+-/*N*/ 		rOut << rDash.GetDistance();
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDashLen());
++/*N*/ 		rOut << static_cast<sal_uInt32>(rDash.GetDistance());
+ /*N*/ 	}
+ /*N*/ 	return rOut;
+ /*N*/ }
+@@ -618,10 +618,10 @@
+ /*N*/ 
+ /*N*/ 	long		nStyle;
+ /*N*/ 	long		nDots;
+-/*N*/ 	ULONG		nDotLen;
++/*N*/ 	sal_uInt32	nDotLen;
+ /*N*/ 	long		nDashes;
+-/*N*/ 	ULONG		nDashLen;
+-/*N*/ 	ULONG		nDistance;
++/*N*/ 	sal_uInt32	nDashLen;
++/*N*/ 	sal_uInt32	nDistance;
+ /*N*/ 
+ /*N*/ 	rIn >> nCount;
+ /*N*/ 
+Index: binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx	8 Sep 2005 07:43:06 -0000	1.6
++++ binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx	27 Apr 2006 15:45:26 -0000	1.6.72.1
+@@ -195,9 +195,9 @@
+ /*N*/ 		rOut << rGradient.GetEndColor().GetGreen();
+ /*N*/ 		rOut << rGradient.GetEndColor().GetBlue();
+ /*N*/ 		rOut << rGradient.GetAngle();
+-/*N*/ 		rOut << (ULONG)rGradient.GetBorder();
+-/*N*/ 		rOut << (ULONG)rGradient.GetXOffset();
+-/*N*/ 		rOut << (ULONG)rGradient.GetYOffset();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetBorder();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetXOffset();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetYOffset();
+ /*N*/ 		pEntry = (XGradientEntry*)aTable.Next();
+ /*N*/ 	}
+ /*N*/ 
+@@ -227,9 +227,9 @@
+ /*N*/ 	Color	aStart;
+ /*N*/ 	Color	aEnd;
+ /*N*/ 	long	nAngle;
+-/*N*/ 	ULONG	nBorder;
+-/*N*/ 	ULONG	nXOfs;
+-/*N*/ 	ULONG	nYOfs;
++/*N*/ 	sal_uInt32 nBorder;
++/*N*/ 	sal_uInt32 nXOfs;
++/*N*/ 	sal_uInt32 nYOfs;
+ /*N*/ 
+ /*N*/ 	rIn >> nType;
+ /*N*/ 
+@@ -567,11 +567,11 @@
+ /*N*/ 		nCol = nCol << 8;
+ /*N*/ 		rOut << nCol;
+ /*N*/ 		rOut << rGradient.GetAngle();
+-/*N*/ 		rOut << (ULONG)rGradient.GetBorder();
+-/*N*/ 		rOut << (ULONG)rGradient.GetXOffset();
+-/*N*/ 		rOut << (ULONG)rGradient.GetYOffset();
+-/*N*/ 		rOut << (ULONG)rGradient.GetStartIntens();
+-/*N*/ 		rOut << (ULONG)rGradient.GetEndIntens();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetBorder();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetXOffset();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetYOffset();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetStartIntens();
++/*N*/ 		rOut << (sal_uInt32)rGradient.GetEndIntens();
+ /*N*/ 	}
+ /*N*/ 
+ /*N*/ 	return rOut;
+@@ -618,11 +618,11 @@
+ /*N*/ 	Color	aStart;
+ /*N*/ 	Color	aEnd;
+ /*N*/ 	long	nAngle;
+-/*N*/ 	ULONG	nBorder;
+-/*N*/ 	ULONG	nXOfs;
+-/*N*/ 	ULONG	nYOfs;
+-/*N*/ 	ULONG	nStartIntens;
+-/*N*/ 	ULONG	nEndIntens;
++/*N*/ 	sal_uInt32 nBorder;
++/*N*/ 	sal_uInt32 nXOfs;
++/*N*/ 	sal_uInt32 nYOfs;
++/*N*/ 	sal_uInt32 nStartIntens;
++/*N*/ 	sal_uInt32 nEndIntens;
+ /*N*/ 
+ /*N*/ 	// Kennung oder Anzahl
+ /*N*/ 	rIn >> nCheck;
+Index: binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx	8 Sep 2005 07:43:54 -0000	1.6
++++ binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx	27 Apr 2006 15:45:26 -0000	1.6.72.1
+@@ -273,7 +273,7 @@
+ /*N*/ 				rIn.ReadByteString(aName);
+ /*N*/ 	
+ /*N*/ 				USHORT nPoints;
+-/*N*/ 				ULONG  nTemp;
++/*N*/ 				sal_uInt32 nTemp;
+ /*N*/ 				Point  aPoint;
+ /*N*/ 				rIn >> nTemp; nPoints = (USHORT)nTemp;
+ /*N*/ 				XPolygon* pXPoly = new XPolygon(nPoints);
+@@ -672,7 +672,7 @@
+ /*N*/ 
+ /*N*/ 			aName = ConvertName( aName );
+ /*N*/ 			USHORT nPoints;
+-/*N*/ 			ULONG  nTemp;
++/*N*/ 			sal_uInt32 nTemp;
+ /*N*/ 			Point  aPoint;
+ /*N*/ 			rIn >> nTemp; nPoints = (USHORT)nTemp;
+ /*N*/ 			XPolygon* pXPoly = new XPolygon(nPoints);
+Index: binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/doc/sw_docedt.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sw/source/core/doc/sw_docedt.cxx	8 Sep 2005 08:34:56 -0000	1.6
++++ binfilter/bf_sw/source/core/doc/sw_docedt.cxx	27 Apr 2006 10:41:56 -0000	1.6.70.1
+@@ -2241,7 +2241,7 @@
+ /*N*/ 
+ 	/* #i9185# This whould lead to a segmentation fault if not catched
+        above. */
+-/*N*/ 	sal_uInt32 nNextNd = rEnd.nNode.GetIndex() + 1;
++/*N*/ 	ULONG nNextNd = rEnd.nNode.GetIndex() + 1;
+ /*N*/ 	SwTableNode* pTblNd = aNodes[ nNextNd ]->GetTableNode();
+ /*N*/ 
+ /*N*/ 	if( pTblNd && pNd->IsCntntNode() )
+Index: binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx	8 Sep 2005 08:45:26 -0000	1.6
++++ binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx	27 Apr 2006 10:49:47 -0000	1.6.72.1
+@@ -749,7 +749,7 @@
+ /*?*/			rChg.GetValueFormat( sFmt, eLng, eSys );
+ /*?*/			if( sFmt.Len() )
+ /*?*/			{
+-/*?*/				ULONG nKey = 0;
++/*?*/				sal_uInt32 nKey = 0;
+ /*?*/				if ( eLng == LANGUAGE_SYSTEM && eSys != ::binfilter::GetAppLanguage() )
+ /*?*/				{
+ /*?*/					//	#53381# wenn System beim Speichern etwas anderes war,
+Index: binfilter/bf_sw/source/core/fields/sw_cellfml.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/fields/sw_cellfml.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/bf_sw/source/core/fields/sw_cellfml.cxx	8 Sep 2005 09:06:44 -0000	1.5
++++ binfilter/bf_sw/source/core/fields/sw_cellfml.cxx	27 Apr 2006 14:17:39 -0000	1.5.70.1
+@@ -267,7 +267,7 @@
+ /*N*/ 
+ /*N*/ 			double aNum;
+ /*N*/ 			String sTxt( rTxt.Copy( nSttPos ) );
+-/*N*/ 			ULONG nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
++/*N*/ 			sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+ /*N*/ 
+ /*N*/ 			SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
+ /*N*/ 
+@@ -277,7 +277,7 @@
+ /*?*/ 			else if( sTxt.Len() &&
+ /*?*/ 					NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex ))
+ /*?*/ 			{
+-/*?*/ 				ULONG nTmpFmt = 0;
++/*?*/ 				sal_uInt32 nTmpFmt = 0;
+ /*?*/ 				if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
+ /*?*/ 					NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt ))
+ /*?*/ 					sTxt += '%';
+Index: binfilter/bf_sw/source/core/fields/sw_docufld.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/fields/sw_docufld.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_sw/source/core/fields/sw_docufld.cxx	8 Sep 2005 09:10:04 -0000	1.8
++++ binfilter/bf_sw/source/core/fields/sw_docufld.cxx	27 Apr 2006 14:29:08 -0000	1.8.70.1
+@@ -446,7 +446,7 @@
+ /*N*/ {
+ /*N*/ }
+ 
+-/*N*/ String SwAuthorFieldType::Expand(sal_uInt32 nFmt) const
++/*N*/ String SwAuthorFieldType::Expand(ULONG nFmt) const
+ /*N*/ {
+ /*N*/ 	String sRet;
+ /*N*/ 	SvtUserOptions aOpt;
+@@ -556,7 +556,7 @@
+ /*N*/ 	pDoc = pDocument;
+ /*N*/ }
+ 
+-/*M*/ String SwFileNameFieldType::Expand(sal_uInt32 nFmt) const
++/*M*/ String SwFileNameFieldType::Expand(ULONG nFmt) const
+ /*M*/ {
+ /*M*/ 	String aRet;
+ /*M*/ 	const SwDocShell* pDShell = pDoc->GetDocShell();
+@@ -741,7 +741,7 @@
+ /*N*/ 	pDoc = pDocument;
+ /*N*/ }
+ 
+-/*N*/ String SwTemplNameFieldType::Expand(sal_uInt32 nFmt) const
++/*N*/ String SwTemplNameFieldType::Expand(ULONG nFmt) const
+ /*N*/ {
+ /*N*/ 	ASSERT(nFmt >= FF_BEGIN && nFmt < FF_END, "Expand: kein guelt. Fmt!" );
+ /*N*/ 
+Index: binfilter/bf_sw/source/core/fields/sw_fldbas.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/fields/sw_fldbas.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_sw/source/core/fields/sw_fldbas.cxx	8 Sep 2005 09:11:01 -0000	1.8
++++ binfilter/bf_sw/source/core/fields/sw_fldbas.cxx	27 Apr 2006 14:43:14 -0000	1.8.70.1
+@@ -249,7 +249,7 @@
+ 					Felder sind n-mal vorhanden, Feldtypen nur einmal
+  --------------------------------------------------------------------*/
+ 
+-/*N*/ SwField::SwField(SwFieldType* pTyp, ULONG nFmt, USHORT nLng) :
++/*N*/ SwField::SwField(SwFieldType* pTyp, sal_uInt32 nFmt, USHORT nLng) :
+ /*N*/ 	nFormat(nFmt),
+ /*N*/     nLang(nLng),
+ /*N*/     bIsAutomaticLanguage(TRUE)
+@@ -534,7 +534,7 @@
+ /*N*/ 	nLang = nLng;
+ /*N*/ }
+ 
+-/*N*/ void SwField::ChangeFormat(ULONG n)
++/*N*/ void SwField::ChangeFormat(sal_uInt32 n)
+ /*N*/ {
+ /*N*/ 	nFormat = n;
+ /*N*/ }
+@@ -672,7 +672,7 @@
+ 	Beschreibung: Numerierung expandieren
+  --------------------------------------------------------------------*/
+ 
+-/*N*/ String FormatNumber(USHORT nNum, ULONG nFormat)
++/*N*/ String FormatNumber(USHORT nNum, sal_uInt32 nFormat)
+ /*N*/ {
+ /*N*/     if(SVX_NUM_PAGEDESC == nFormat)
+ /*?*/         return  String::CreateFromInt32( nNum );
+@@ -707,7 +707,7 @@
+  --------------------------------------------------------------------*/
+ 
+ /*N*/ String SwValueFieldType::ExpandValue( const double& rVal,
+-/*N*/ 										ULONG nFmt, USHORT nLng) const
++/*N*/ 										sal_uInt32 nFmt, USHORT nLng) const
+ /*N*/ {
+ /*N*/ 	if (rVal >= DBL_MAX)		// FehlerString fuer Calculator
+ /*?*/ 		return ViewShell::GetShellRes()->aCalc_Error;
+@@ -728,7 +728,7 @@
+ /*?*/ 
+ /*?*/ 		if (pEntry && nLng != pEntry->GetLanguage())
+ /*?*/ 		{
+-/*?*/ 			ULONG nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
++/*?*/ 			sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(nFmt,
+ /*?*/ 													(LanguageType)nFmtLng);
+ /*?*/ 
+ /*?*/ 			if (nNewFormat == nFmt)
+@@ -793,7 +793,7 @@
+ 	Beschreibung: CTOR SwValueField
+  --------------------------------------------------------------------*/
+ 
+-/*N*/ SwValueField::SwValueField( SwValueFieldType* pFldType, ULONG nFmt,
++/*N*/ SwValueField::SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt,
+ /*N*/ 							USHORT nLang, const double fVal )
+ /*N*/ 	: SwField(pFldType, nFmt, nLang),
+ /*N*/ 	fValue(fVal)
+@@ -884,7 +884,7 @@
+ /*N*/ {
+ /*N*/     if( IsAutomaticLanguage() && 
+ /*N*/             ((SwValueFieldType *)GetTyp())->UseFormat() &&
+-/*N*/ 		GetFormat() != ULONG_MAX )
++/*N*/ 		GetFormat() != SAL_MAX_UINT32 )
+ /*N*/ 	{
+ /*N*/ 		// wegen Bug #60010
+ /*N*/ 		SvNumberFormatter* pFormatter = GetDoc()->GetNumberFormatter();
+@@ -899,7 +899,7 @@
+ /*N*/ 
+ /*N*/ 			if( pEntry && nFmtLng != pEntry->GetLanguage() )
+ /*N*/ 			{
+-/*N*/ 				ULONG nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(
++/*N*/ 				sal_uInt32 nNewFormat = pFormatter->GetFormatForLanguageIfBuiltIn(
+ /*N*/ 										GetFormat(), (LanguageType)nFmtLng );
+ /*N*/ 
+ /*N*/ 				if( nNewFormat == GetFormat() )
+@@ -940,7 +940,7 @@
+ 	Beschreibung: SwFormulaField
+  --------------------------------------------------------------------*/
+ 
+-/*N*/ SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, ULONG nFmt, const double fVal)
++/*N*/ SwFormulaField::SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt, const double fVal)
+ /*N*/ 	: SwValueField(pFldType, nFmt, LANGUAGE_SYSTEM, fVal)
+ /*N*/ {
+ /*N*/ }
+@@ -968,9 +968,9 @@
+ /*N*/ {
+ /*N*/ 	sFormula = rStr;
+ /*N*/ 
+-/*N*/ 	ULONG nFmt(GetFormat());
++/*N*/ 	sal_uInt32 nFmt(GetFormat());
+ /*N*/ 
+-/*N*/ 	if( nFmt && ULONG_MAX != nFmt )
++/*N*/ 	if( nFmt && SAL_MAX_UINT32 != nFmt )
+ /*N*/ 	{
+ /*N*/ 		xub_StrLen nPos = 0;
+ /*N*/ 		double fValue;
+@@ -985,9 +985,9 @@
+ 
+ void SwFormulaField::SetExpandedFormula( const String& rStr )
+ {
+-    ULONG nFmt(GetFormat());
++    sal_uInt32 nFmt(GetFormat());
+ 
+-    if (nFmt && nFmt != ULONG_MAX && ((SwValueFieldType *)GetTyp())->UseFormat())
++    if (nFmt && nFmt != SAL_MAX_UINT32 && ((SwValueFieldType *)GetTyp())->UseFormat())
+     {
+         double fValue;
+ 
+@@ -1011,9 +1011,9 @@
+ 
+ String SwFormulaField::GetExpandedFormula() const
+ {
+-    ULONG nFmt(GetFormat());
++    sal_uInt32 nFmt(GetFormat());
+ 
+-    if (nFmt && nFmt != ULONG_MAX && ((SwValueFieldType *)GetTyp())->UseFormat())
++    if (nFmt && nFmt != SAL_MAX_UINT32 && ((SwValueFieldType *)GetTyp())->UseFormat())
+     {
+         String sFormattedValue;
+         Color* pCol = 0;
+Index: binfilter/bf_sw/source/core/fields/sw_usrfld.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/fields/sw_usrfld.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sw/source/core/fields/sw_usrfld.cxx	8 Sep 2005 09:14:28 -0000	1.6
++++ binfilter/bf_sw/source/core/fields/sw_usrfld.cxx	27 Apr 2006 14:43:14 -0000	1.6.72.1
+@@ -301,7 +301,7 @@
+ 
+ /*N*/ String SwUserFieldType::GetContent( sal_uInt32 nFmt )
+ /*N*/ {
+-/*N*/ 	if (nFmt && nFmt != ULONG_MAX)
++/*N*/ 	if (nFmt && nFmt != SAL_MAX_UINT32)
+ /*N*/ 	{
+ /*?*/ 		String sFormattedValue;
+ /*?*/ 		Color* pCol = 0;
+@@ -321,7 +321,7 @@
+ /*N*/ 	{
+ /*N*/ 		aContent = rStr;
+ /*N*/ 
+-/*N*/ 		if (nFmt && nFmt != ULONG_MAX)
++/*N*/ 		if (nFmt && nFmt != SAL_MAX_UINT32)
+ /*N*/ 		{
+ /*?*/ 			double fValue;
+ /*?*/ 
+Index: binfilter/bf_sw/source/core/inc/drawfont.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/inc/drawfont.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.10.1
+diff -u -r1.4 -r1.4.10.1
+--- binfilter/bf_sw/source/core/inc/drawfont.hxx	7 Apr 2006 13:29:22 -0000	1.4
++++ binfilter/bf_sw/source/core/inc/drawfont.hxx	28 Apr 2006 08:58:37 -0000	1.4.10.1
+@@ -182,7 +182,7 @@
+     USHORT HasKana( xub_StrLen nStart, const xub_StrLen nEnd ) const;
+ 
+     // modifies the kerning array according to a given compress value
+-    long Compress( long* pKernArray, xub_StrLen nIdx, xub_StrLen nLen,
++    long Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen,
+                    const USHORT nCompress, const USHORT nFontHeight,
+                    Point* pPoint = NULL ) const;
+ 
+Index: binfilter/bf_sw/source/core/layout/sw_flycnt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_flycnt.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/layout/sw_flycnt.cxx	8 Sep 2005 09:47:15 -0000	1.5
++++ binfilter/bf_sw/source/core/layout/sw_flycnt.cxx	27 Apr 2006 11:47:13 -0000	1.5.72.1
+@@ -774,7 +774,7 @@
+ /*N*/ 		{
+ /*N*/ 			//Jetzt die Entfernung zwischen den beiden Punkten berechnen.
+ /*N*/ 			//'Delta' X^2 + 'Delta'Y^2 = 'Entfernung'^2
+-/*N*/ 			ULONG dX = Max( pCnt->Frm().Left(), rPt.X() ) -
++/*N*/ 			sal_uInt32 dX = Max( pCnt->Frm().Left(), rPt.X() ) -
+ /*N*/ 					   Min( pCnt->Frm().Left(), rPt.X() ),
+ /*N*/ 				  dY = Max( pCnt->Frm().Top(), rPt.Y() ) -
+ /*N*/ 					   Min( pCnt->Frm().Top(), rPt.Y() );
+Index: binfilter/bf_sw/source/core/layout/sw_frmtool.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_frmtool.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/layout/sw_frmtool.cxx	8 Sep 2005 09:48:44 -0000	1.5
++++ binfilter/bf_sw/source/core/layout/sw_frmtool.cxx	27 Apr 2006 11:48:17 -0000	1.5.72.1
+@@ -2586,7 +2586,7 @@
+ /*N*/ 			nOldErg = nErg;
+ /*N*/ 		}
+ /*N*/ 	}
+-/*N*/ 	return nErg >= BigInt((ULONG)ULONG_MAX) ? ULONG_MAX : (ULONG)nErg;
++/*N*/ 	return nErg >= BigInt(SAL_MAX_UINT32) ? ULONG_MAX : (ULONG)nErg;
+ /*N*/ }
+ 
+ /*************************************************************************
+Index: binfilter/bf_sw/source/core/layout/sw_laycache.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_laycache.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/layout/sw_laycache.cxx	8 Sep 2005 09:50:11 -0000	1.5
++++ binfilter/bf_sw/source/core/layout/sw_laycache.cxx	27 Apr 2006 11:51:11 -0000	1.5.72.1
+@@ -280,9 +280,9 @@
+ /*N*/                             aIo.OpenFlagRec( bFollow ? 0x01 : 0x00,
+ /*N*/                                             bFollow ? 8 : 4 );
+ /*N*/                             nNdIdx -= nStartOfContent;
+-/*N*/                             aIo.GetStream() << nNdIdx;
++/*N*/                             aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx);
+ /*N*/                             if( bFollow )
+-/*?*/                                 aIo.GetStream() << (ULONG)((SwTxtFrm*)pTmp)->GetOfst();
++/*?*/                                 aIo.GetStream() << static_cast<sal_uInt32>(((SwTxtFrm*)pTmp)->GetOfst());
+ /*N*/                             aIo.CloseFlagRec();
+ /*N*/                             /*  Close Paragraph Record */
+ /*N*/                             aIo.CloseRec( SW_LAYCACHE_IO_REC_PARA );
+@@ -321,8 +321,8 @@
+ /*N*/                                 aIo.OpenRec( SW_LAYCACHE_IO_REC_TABLE );
+ /*N*/                                 aIo.OpenFlagRec( 0, 8 );
+ /*N*/                                 nNdIdx -= nStartOfContent;
+-/*N*/                                 aIo.GetStream() << nNdIdx
+-/*N*/                                                 << nOfst;
++/*N*/                                 aIo.GetStream() << static_cast<sal_uInt32>(nNdIdx)
++/*N*/                                                 << static_cast<sal_uInt32>(nOfst);
+ /*N*/                                 aIo.CloseFlagRec();
+ /*N*/                                 /* Close Table Record  */
+ /*N*/                                 aIo.CloseRec( SW_LAYCACHE_IO_REC_TABLE );
+@@ -375,15 +375,15 @@
+ /*?*/                             const SwContact *pC = (SwContact*)GetUserCall(pO);
+ /*?*/                             if( pC )
+ /*?*/                             {
+-/*?*/                                 ULONG nOrdNum = pO->GetOrdNum();
++/*?*/                                 sal_uInt32 nOrdNum = pO->GetOrdNum();
+ /*?*/                                 USHORT nPageNum = pPage->GetPhyPageNum();
+ /*?*/                                 /* Open Fly Record */
+ /*?*/                                 aIo.OpenRec( SW_LAYCACHE_IO_REC_FLY );
+ /*?*/                                 aIo.OpenFlagRec( 0, 0 );
+ /*?*/                                 aIo.CloseFlagRec();
+ /*?*/                                 SwRect &rRct = pFly->Frm();
+-/*?*/                                 long nX = rRct.Left() - pPage->Frm().Left();
+-/*?*/                                 long nY = rRct.Top() - pPage->Frm().Top();
++/*?*/                                 sal_Int32 nX = rRct.Left() - pPage->Frm().Left();
++/*?*/                                 sal_Int32 nY = rRct.Top() - pPage->Frm().Top();
+ /*?*/                                 aIo.GetStream() << nPageNum << nOrdNum
+ /*?*/                                                 << nX << nY << rRct.Width()
+ /*?*/                                                 << rRct.Height();
+Index: binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx	8 Sep 2005 09:53:38 -0000	1.5
++++ binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx	27 Apr 2006 11:51:52 -0000	1.5.72.1
+@@ -1058,7 +1058,7 @@
+ /*N*/ {
+ /*N*/ 	//Jetzt die Entfernung zwischen den beiden Punkten berechnen.
+ /*N*/ 	//'Delta' X^2 + 'Delta'Y^2 = 'Entfernung'^2
+-/*N*/ 	ULONG dX = Max( rPt1.X(), rPt2.X() ) -
++/*N*/ 	sal_uInt32 dX = Max( rPt1.X(), rPt2.X() ) -
+ /*N*/ 			   Min( rPt1.X(), rPt2.X() ),
+ /*N*/ 		  dY = Max( rPt1.Y(), rPt2.Y() ) -
+ /*N*/ 			   Min( rPt1.Y(), rPt2.Y() );
+Index: binfilter/bf_sw/source/core/sw3io/sw3imp.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sw/source/core/sw3io/sw3imp.hxx	8 Sep 2005 09:58:01 -0000	1.6
++++ binfilter/bf_sw/source/core/sw3io/sw3imp.hxx	28 Apr 2006 08:58:38 -0000	1.6.72.1
+@@ -308,7 +308,7 @@
+ 	void   Store( SvStream& );
+ 
+ 	static USHORT ConvertFromOldPoolId( USHORT nId, USHORT nVersion );
+-	static USHORT ConvertToOldPoolId( USHORT nId, ULONG nFFVersion );
++	static USHORT ConvertToOldPoolId( USHORT nId, sal_uInt32 nFFVersion );
+ };
+ 
+ // Informationen, die nur beim Export eines Doks benoetigt werden
+@@ -437,8 +437,8 @@
+ 	SvUShorts*		   pSectionDepths;
+ 	Sw3Fmts*		   pConvToSymbolFmts;
+ 	SwHiddenDrawObjList_Impl *pHiddenDrawObjs;
+-	ULONG			   nCurPercent;	// Aktueller Stand der Prozentanzeige
+-	ULONG			   nEndPercent;	// Maximalwert der Prozentanzeige
++	sal_uInt32		   nCurPercent;	// Aktueller Stand der Prozentanzeige
++	sal_uInt32		   nEndPercent;	// Maximalwert der Prozentanzeige
+ 	UINT32			   nDate,nTime;	// Zeitpunkt der Speicherung
+ 	long			   nSizeDivFac;	// Divisionsfaktor fuer FRMSIZE-Attribs
+ 
+@@ -530,8 +530,8 @@
+ 	BOOL OpenRec( BYTE cType );		// Record oeffnen
+ 	void CloseRec( BYTE cType );	// Record schliessen
+ 	void SkipRec();					// Record uebergehen
+-    void InsertRecordSize( ULONG nPos, ULONG nSize );
+-    ULONG GetRecordSize( ULONG nPos );
++    void InsertRecordSize( sal_uInt32 nPos, sal_uInt32 nSize );
++    sal_uInt32 GetRecordSize( sal_uInt32 nPos );
+ 	BOOL HasRecSizes() const { return pRecSizes != 0; }
+     void FlushRecSizes();
+     void InRecSizes( ULONG nRecPos );
+@@ -556,8 +556,8 @@
+ 										sal_Char cSrcDelim,
+ 										sal_Unicode cDelim,
+ 										rtl_TextEncoding eSource );
+-	static ULONG InULong( SvStream& ); 		   // ULONG komprimiert lesen
+-	static void OutULong( SvStream&, ULONG );  // ULONG komprimiert schreiben
++	static sal_uInt32 InULong( SvStream& ); 		   // ULONG komprimiert lesen
++	static void OutULong( SvStream&, sal_uInt32 );  // ULONG komprimiert schreiben
+ 	inline SvStream& InString( SvStream& rStrm, String& rStr );
+ 	inline SvStream& OutString( SvStream& rStrm, const String& rStr );
+ 
+@@ -579,9 +579,9 @@
+ 	inline BOOL IsVersion( USHORT nMinVers1, USHORT nMaxVers1,
+ 						   USHORT nMinVers2, USHORT nMaxVers2 ) const;
+ 
+-	void OpenPercentBar( ULONG, ULONG );
++	void OpenPercentBar( sal_uInt32, sal_uInt32 );
+ 	void ClosePercentBar();
+-	void SetPercentBar( ULONG );
++	void SetPercentBar( sal_uInt32 );
+ 
+ 	void Cleanup( BOOL bConnectPageDescs = TRUE );	// Nach Einlesen aufraeumen
+ 	void ChangeFontItemCharSet();
+Index: binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx	8 Sep 2005 09:59:09 -0000	1.5
++++ binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx	28 Apr 2006 08:58:38 -0000	1.5.72.1
+@@ -1007,7 +1007,7 @@
+ /*N*/ 	ASSERT( nIVer != USHRT_MAX,
+ /*N*/ 			"SwFmtLineNumber: Wer faengt da Version USHRT_MAX nicht ab?" );
+ /*N*/ 
+-/*N*/ 	rStrm << nStartValue << IsCount();
++/*N*/ 	rStrm << static_cast<sal_uInt32>(nStartValue) << IsCount();
+ /*N*/ 	return rStrm;
+ /*N*/ }
+ 
+@@ -1016,7 +1016,7 @@
+ /*N*/ SfxPoolItem* SwFmtLineNumber::Create( SvStream& rStrm, USHORT ) const
+ /*N*/ {
+ /*N*/ 	SwFmtLineNumber *pTmp = new SwFmtLineNumber;
+-/*N*/ 	ULONG nTmp; BOOL bTmp;
++/*N*/ 	sal_uInt32 nTmp; BOOL bTmp;
+ /*N*/ 	rStrm >> nTmp; pTmp->SetStartValue( nTmp );
+ /*N*/ 	rStrm >> bTmp; pTmp->SetCountLines( bTmp );
+ /*N*/ 	return pTmp;
+Index: binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx,v
+retrieving revision 1.8
+retrieving revision 1.8.70.1
+diff -u -r1.8 -r1.8.70.1
+--- binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx	8 Sep 2005 10:00:25 -0000	1.8
++++ binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx	28 Apr 2006 08:58:38 -0000	1.8.70.1
+@@ -239,7 +239,7 @@
+ };
+ 
+ /*N*/ void sw3io_ConvertFromOldField( SwDoc& rDoc, USHORT& rWhich,
+-/*N*/ 								USHORT& rSubType, ULONG &rFmt,
++/*N*/ 								USHORT& rSubType, UINT32 &rFmt,
+ /*N*/ 								USHORT nVersion )
+ /*N*/ {
+ /*N*/ 	const OldFormats *pOldFmt = 0L;
+@@ -347,10 +347,10 @@
+ /*N*/ }
+ 
+ /*N*/ void sw3io_ConvertToOldField( const SwField* pFld, USHORT& rWhich,
+-/*N*/ 							  ULONG& rFmt, ULONG nFFVersion )
++/*N*/ 							  UINT32& rFmt, ULONG nFFVersion )
+ /*N*/ {
+ /*N*/ 	const OldFormats *pOldFmt = 0L;
+-/*N*/ 	ULONG nOldFmt = rFmt;
++/*N*/ 	UINT32 nOldFmt = rFmt;
+ /*N*/ 
+ /*N*/ 	switch( rWhich )
+ /*N*/ 	{
+@@ -444,7 +444,7 @@
+ /*N*/ 			while( pOldFmt[i].eFormatIdx != NF_NUMERIC_START ||
+ /*N*/ 				   pOldFmt[i].nOldFormat )
+ /*N*/ 			{
+-/*N*/ 				ULONG nKey = pFormatter->GetFormatIndex(
++/*N*/ 				sal_uInt32 nKey = pFormatter->GetFormatIndex(
+ /*N*/ 							pOldFmt[i].eFormatIdx, pEntry->GetLanguage() );
+ /*N*/ 
+ /*N*/ 				if( nOldFmt == nKey )
+@@ -875,7 +875,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDBField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								USHORT nSubType, ULONG& rFmt )
++/*N*/ 								USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 	String aName;
+@@ -932,7 +932,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InDBField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 							  USHORT nSubType, ULONG& rFmt )
++/*N*/ 							  USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 	String aExpand;
+@@ -1038,7 +1038,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InFileNameField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT, ULONG& rFmt )
++/*N*/ 									USHORT, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	// Das fixe Feld gibt es erst in der 5.1. Da das Fileformat zur 5.0
+ /*N*/ 	// kompatibel geblieben ist und die 5.0 das Fixed-Flag nicht loescht,
+@@ -1068,7 +1068,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDBNameField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT, ULONG& )
++/*N*/ 								  USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aDBName;
+ /*N*/ 	if( rIo.IsVersion( SWG_MULTIDB, SWG_EXPORT31, SWG_DESKTOP40 ) )
+@@ -1101,7 +1101,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDateField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT nSubType, ULONG& )
++/*N*/ 								  USHORT nSubType, UINT32& )
+ /*N*/ { //SW40.SDW  
+ /*N*/ 	SwDateTimeField* pFld =
+ /*N*/ 		new SwDateTimeField( (SwDateTimeFieldType *)pType, DATEFLD );
+@@ -1113,7 +1113,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT nSubType, ULONG& )
++/*N*/ 								  USHORT nSubType, UINT32& )
+ /*N*/ {
+             SwDateTimeField* pFld =
+                 new SwDateTimeField( (SwDateTimeFieldType*)pType, TIMEFLD );
+@@ -1125,7 +1125,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InPageNumberField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 										USHORT, ULONG& rFmt )
++/*N*/ 										USHORT, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	INT16 nOff;
+ /*N*/ 	UINT16 nSub;
+@@ -1147,7 +1147,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InPageNumberField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									  USHORT nSubType, ULONG& rFmt )
++/*N*/ 									  USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	INT16 nOff;
+ /*N*/ 	String sUserStr;
+@@ -1192,7 +1192,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InUserField40( Sw3IoImp& rIo, SwFieldType *pType,
+-/*N*/ 								  USHORT nSubType, ULONG& rFmt )
++/*N*/ 								  USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 	if( rIo.nVersion < SWG_SHORTFIELDS )
+@@ -1222,7 +1222,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InUserField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								USHORT nSubType, ULONG& )
++/*N*/ 								USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 
+@@ -1251,7 +1251,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InGetRefField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT, ULONG& rFmt )
++/*N*/ 									USHORT, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	String aName, aExpand;
+ /*N*/ 	UINT16 nFmt16 = 0, nSubType, nSeqNo;
+@@ -1290,7 +1290,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InGetRefField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT nSubType, ULONG& )
++/*N*/ 								  USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aName, aExpand;
+ /*N*/ 	UINT16 nFmt = 0, nSeqNo;
+@@ -1355,7 +1355,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InHiddenTxtField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									   USHORT, ULONG& )
++/*N*/ 									   USHORT, UINT32& )
+ /*N*/ { //SW40.SDW  
+ /*N*/ 	BYTE cFlags;
+ /*N*/ 	USHORT nSubType;
+@@ -1381,7 +1381,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InHiddenTxtField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT nSubType, ULONG& )
++/*N*/ 									 USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	BYTE cFlags;
+ /*N*/ 	String aText, aCond;
+@@ -1474,7 +1474,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InPostItField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT, ULONG& )
++/*N*/ 								  USHORT, UINT32& )
+ /*N*/ {
+         INT32 nDate;
+         String aAuthor, aText;
+@@ -1495,7 +1495,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDateTimeField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT nSubType, ULONG& )
++/*N*/ 									USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	double	fVal;
+ /*N*/ 
+@@ -1524,7 +1524,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InFixDateField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& )
++/*N*/ 									 USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	INT32 nVal;
+ /*N*/ 	*rIo.pStrm >> nVal;
+@@ -1544,7 +1544,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InFixTimeField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& )
++/*N*/ 									 USHORT, UINT32& )
+ /*N*/ {
+         INT32 nVal;
+         *rIo.pStrm >> nVal;
+@@ -1563,7 +1563,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InAuthorField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT, ULONG& )
++/*N*/ 								  USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	SwAuthorField *pFld =
+ /*N*/ 		new SwAuthorField( (SwAuthorFieldType*)pType );
+@@ -1587,7 +1587,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InChapterField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								   USHORT, ULONG& )
++/*N*/ 								   USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	SwChapterField* pFld = new SwChapterField( (SwChapterFieldType*)pType );
+ /*N*/ 	if( rIo.nVersion >= SWG_OLENAME )
+@@ -1613,7 +1613,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDocStatField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& rFmt )
++/*N*/ 									 USHORT, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	UINT16 nSubType;
+ /*N*/ 	*rIo.pStrm >> nSubType;
+@@ -1621,7 +1621,7 @@
+ /*N*/ }
+ /*N*/ 
+ /*N*/ SwField* lcl_sw3io_InDocStatField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								   USHORT nSubType, ULONG& rFmt )
++/*N*/ 								   USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	return new SwDocStatField( (SwDocStatFieldType*)pType, nSubType, rFmt );
+ /*N*/ }
+@@ -1636,7 +1636,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDDEField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 							   USHORT, ULONG& )
++/*N*/ 							   USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 	if( rIo.nVersion < SWG_SHORTFIELDS )
+@@ -1665,7 +1665,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InInputField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								 USHORT, ULONG& )
++/*N*/ 								 USHORT, UINT32& )
+ /*N*/ { //SW40.SDW  
+ /*N*/ 	String aContent, aPrompt;
+ /*N*/ 	UINT16 nSubType;
+@@ -1676,7 +1676,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InInputField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								 USHORT nSubType, ULONG& )
++/*N*/ 								 USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aContent, aPrompt;
+ /*N*/ 	rIo.InString( *rIo.pStrm, aContent );
+@@ -1700,7 +1700,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InMacroField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								 USHORT, ULONG& )
++/*N*/ 								 USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aName;
+ /*N*/ 	String aText;
+@@ -1718,7 +1718,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InTblField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 							   USHORT nSubType, ULONG& )
++/*N*/ 							   USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aFormula, aText;
+ /*N*/ 	UINT16 nSub = 0;
+@@ -1754,7 +1754,7 @@
+ /*  */
+ 
+ /*N*/ SwField *lcl_sw3io_InGetExpField40( Sw3IoImp& rIo, SwFieldType *pType,
+-/*N*/ 									USHORT nSubType, ULONG& rFmt )
++/*N*/ 									USHORT nSubType, UINT32& rFmt )
+ /*N*/ { //SW40.SDW  
+ /*N*/ 	String aText, aExpand;
+ /*N*/ 	UINT16 nSub;
+@@ -1774,7 +1774,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InGetExpField( Sw3IoImp& rIo, SwFieldType *pType,
+-/*N*/ 								  USHORT nSubType, ULONG& )
++/*N*/ 								  USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aText, aExpand;
+ /*N*/ 	rIo.InString( *rIo.pStrm, aText );
+@@ -1804,7 +1804,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InSetExpField40( Sw3IoImp& rIo, SwFieldType *pType,
+-/*N*/ 									USHORT nSubType, ULONG& rFmt )
++/*N*/ 									USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 	if( rIo.nVersion < SWG_SHORTFIELDS )
+@@ -1884,7 +1884,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InSetExpField( Sw3IoImp& rIo, SwFieldType *pType,
+-/*N*/ 								  USHORT nSubType, ULONG& rFmt )
++/*N*/ 								  USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	pType = 0;
+ /*N*/ 
+@@ -2005,7 +2005,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InHiddenParaField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									  USHORT, ULONG& )
++/*N*/ 									  USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	BYTE bHidden;
+ /*N*/ 	String aCond;
+@@ -2025,7 +2025,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDocInfoField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT nSubType, ULONG& rFmt )
++/*N*/ 									 USHORT nSubType, UINT32& rFmt )
+ /*N*/ { 
+ /*N*/ 	UINT16 nSub;
+ /*N*/ 	*rIo.pStrm >> nSub;
+@@ -2037,7 +2037,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InDocInfoField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								   USHORT nSubType, ULONG& rFmt )
++/*N*/ 								   USHORT nSubType, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	BYTE cFlags;
+ /*N*/ 	SwDocInfoField *pFld = new SwDocInfoField( (SwDocInfoFieldType*)pType,
+@@ -2098,7 +2098,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InTemplNameField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& rFmt )
++/*N*/ 									 USHORT, UINT32& rFmt )
+ /*N*/ {
+ /*N*/ 	return new SwTemplNameField( (SwTemplNameFieldType*)pType, rFmt );
+ /*N*/ }
+@@ -2106,7 +2106,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDBNextSetField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& )
++/*N*/ 									 USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aName, aCond, aDBName;
+ /*N*/ 	rIo.InString( *rIo.pStrm, aCond );
+@@ -2145,7 +2145,7 @@
+ // in der exportierten Version auch verkehrt herum wieder ein.
+ 
+ /*N*/ SwField* lcl_sw3io_InDBNumSetField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT, ULONG& )
++/*N*/ 									USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aNumber, aCond, aDBName;
+ /*N*/ 
+@@ -2198,7 +2198,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InDBSetNumberField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									   USHORT, ULONG& )
++/*N*/ 									   USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aDBName;
+ /*N*/ 	INT32 n;
+@@ -2234,7 +2234,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InExtUserField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									 USHORT, ULONG& )
++/*N*/ 									 USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aData;
+ /*N*/ 	UINT16 nSubType;
+@@ -2246,7 +2246,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InExtUserField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								   USHORT nSubType, ULONG& )
++/*N*/ 								   USHORT nSubType, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aData;
+ /*N*/ 	rIo.InString( *rIo.pStrm, aData );
+@@ -2281,7 +2281,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InRefPageSetField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									  USHORT, ULONG& )
++/*N*/ 									  USHORT, UINT32& )
+ /*N*/ {
+             INT16 nOffset;
+             BYTE cIsOn;
+@@ -2298,7 +2298,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InRefPageGetField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									  USHORT, ULONG& )
++/*N*/ 									  USHORT, UINT32& )
+ /*N*/ {
+             String aString;
+             SwRefPageGetField *pFld = new SwRefPageGetField( (SwRefPageGetFieldType*)pType, 0 );
+@@ -2314,7 +2314,7 @@
+ 
+ /*  */
+ 
+-/*N*/ SwField *lcl_sw3io_InINetField31( Sw3IoImp& rIo, SwFieldType *, USHORT, ULONG& )
++/*N*/ SwField *lcl_sw3io_InINetField31( Sw3IoImp& rIo, SwFieldType *, USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	ASSERT( !(rIo.pFmtINetFmt || rIo.aINetFldText.Len()),
+ /*N*/ 			"Da sind noch Rest-Infos vom INet-Feld!" );
+@@ -2356,7 +2356,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InJumpEditField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT, ULONG& )
++/*N*/ 									USHORT, UINT32& )
+ /*N*/ {
+ /*N*/ 	String aText, aHelp;
+ /*N*/ 	rIo.InString( *rIo.pStrm, aText );
+@@ -2374,7 +2374,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InScriptField40( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 									USHORT, ULONG& )
++/*N*/ 									USHORT, UINT32& )
+ /*N*/ {
+         String aType, aCode;
+         BYTE cFlags = 0;
+@@ -2403,7 +2403,7 @@
+ /*N*/ }
+ 
+ /*N*/ SwField* lcl_sw3io_InScriptField( Sw3IoImp& rIo, SwFieldType* pType,
+-/*N*/ 								  USHORT, ULONG& )
++/*N*/ 								  USHORT, UINT32& )
+ /*N*/ {
+         String aType, aCode;
+         BYTE cFlags = 0;
+@@ -2460,7 +2460,7 @@
+ /*  */
+ 
+ /*N*/ SwField* lcl_sw3io_InAuthorityField( Sw3IoImp& rIo, SwFieldType*,
+-/*N*/ 								  USHORT, ULONG& )
++/*N*/ 								  USHORT, UINT32& )
+ /*N*/ {
+         rIo.OpenFlagRec();
+ 
+@@ -2501,7 +2501,7 @@
+ 
+ #define	SWG_FIELD 'y'
+ 
+-typedef SwField *(*Sw3InFieldFn)( Sw3IoImp&, SwFieldType*, USHORT, ULONG& );
++typedef SwField *(*Sw3InFieldFn)( Sw3IoImp&, SwFieldType*, USHORT, UINT32& );
+ 
+ static Sw3InFieldFn aInFieldFnTbl40[] =
+ {
+@@ -2840,7 +2840,7 @@
+ /*N*/ 		return;
+ /*N*/ 
+ /*N*/ 	UINT16 nWhich = pType->Which();
+-/*N*/ 	ULONG nFmt = pFld->GetFormat();
++/*N*/ 	sal_uInt32 nFmt = pFld->GetFormat();
+ /*N*/ 
+ /*N*/ 	if( SOFFICE_FILEFORMAT_40 >= pStrm->GetVersion() )
+ /*N*/ 	{
+Index: binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx	8 Sep 2005 10:01:25 -0000	1.6
++++ binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx	28 Apr 2006 08:58:39 -0000	1.6.72.1
+@@ -273,14 +273,14 @@
+ 		Table()
+ 	{}
+ 
+-	sal_Bool Insert( sal_uInt32 nKey, sal_uInt32 p )
++	sal_Bool Insert( ULONG nKey, sal_uInt32 p )
+ 	{
+ 		return Table::Insert( nKey, (void*)p );
+ 	}
+ 
+-	sal_uInt32 GetObject( sal_uInt32 nPos ) const
++	sal_uInt32 GetObject( ULONG nPos ) const
+ 	{
+-		return (sal_Int32)Table::GetObject( nPos );
++		return (sal_uIntPtr)Table::GetObject( nPos );
+ 	}
+ };
+ 
+@@ -487,12 +487,12 @@
+ /*N*/ }
+ #endif
+ 
+-/*N*/ void Sw3IoImp::Error( sal_uInt32 nCode )
++/*N*/ void Sw3IoImp::Error( ULONG nCode )
+ /*N*/ {
+ /*N*/ 	nRes = nCode ? nCode : ERR_SWG_FILE_FORMAT_ERROR;
+ /*N*/ }
+  
+-/*N*/ void Sw3IoImp::Warning( sal_uInt32 nCode )
++/*N*/ void Sw3IoImp::Warning( ULONG nCode )
+ /*N*/ {
+ /*N*/ 	nWarn = nCode ? nCode : WARN_SWG_FEATURES_LOST;
+ /*N*/ }
+@@ -907,7 +907,7 @@
+ /*N*/ 		if( LONG_RECSIZE == nSize && IsVersion( SWG_LONGRECS ) )
+ /*N*/ 		{
+                 sal_uInt32 nTmp = GetRecordSize( nPos );
+-/*?*/           if( nTmp != ULONG_MAX )
++/*?*/           if( nTmp != SAL_MAX_UINT32 )
+ /*?*/               nSize = nTmp;
+ /*N*/ 		}
+ /*N*/ 
+@@ -1022,14 +1022,15 @@
+ 
+ sal_uInt32 Sw3IoImp::GetRecordSize( sal_uInt32 nPos )
+ {
+-    sal_uInt32 nTablePos, nRet = ULONG_MAX;
++    sal_uInt32 nRet = SAL_MAX_UINT32;
++    ULONG nTablePos;
+ 
+     if( pRecSizes &&
+         TABLE_ENTRY_NOTFOUND != pRecSizes->SearchKey( nPos, &nTablePos ) )
+     {
+         nRet = pRecSizes->GetObject( nTablePos );
+     }
+-    ASSERT( nRet != ULONG_MAX, "Record-Size nicht gefunden" );
++    ASSERT( nRet != SAL_MAX_UINT32, "Record-Size nicht gefunden" );
+ 
+     return nRet;
+ }
+@@ -1042,14 +1043,14 @@
+ 
+ // Zurueckliefern, wie viele Bytes ein Record noch enthaelt
+ 
+-/*N*/ sal_uInt32 Sw3IoImp::BytesLeft()
++/*N*/ ULONG Sw3IoImp::BytesLeft()
+ /*N*/ {
+ /*N*/ 	sal_uInt16 nLvl = aRecSizes.Count();
+-/*N*/ 	sal_uInt32 n = 0;
++/*N*/ 	ULONG n = 0;
+ /*N*/ 	if( nLvl && !nRes )
+ /*N*/ 	{
+ /*N*/ 		sal_uInt32 nEndPos = aRecSizes[ nLvl-1 ];
+-/*N*/ 		sal_uInt32 nPos = pStrm->Tell();
++/*N*/ 		ULONG nPos = pStrm->Tell();
+ /*N*/ 		if( nEndPos > nPos )
+ /*N*/ 			n = nEndPos - nPos;
+ /*N*/ 	}
+@@ -1094,7 +1095,7 @@
+ /*N*/ 	CloseRec( c );
+ /*N*/ }
+ 
+-void Sw3IoImp::InRecSizes( sal_uInt32 nRecPos )
++void Sw3IoImp::InRecSizes( ULONG nRecPos )
+ {
+     ASSERT( !pRecSizes, "RecSize-Tabelle existiert noch" );
+     ASSERT( nRecPos, "Keine Position der RecSize-Tabelle" );
+@@ -1106,7 +1107,7 @@
+         // Wenn der Stream vor dem Record steht, wird der Record
+         // normal gelesen. Sonst wird erstmal zu ihm geseekt und
+         // nach dem Lesen wieder am die aktuelle Stelle zurueck.
+-        sal_uInt32 nOldPos = pStrm->Tell();
++        ULONG nOldPos = pStrm->Tell();
+         if( nOldPos != nRecPos )
+             pStrm->Seek( nRecPos );
+ 
+@@ -1116,10 +1117,10 @@
+         *pStrm >> nCount;
+         CloseFlagRec();
+ 
+-        for( sal_uInt32 i=0; i < (sal_uInt32)nCount; i++ )
++        for( sal_uInt32 i=0; i < nCount; i++ )
+         {
+             *pStrm >> nPos >> nSize;
+-            pRecSizes->Insert( (sal_uInt32)nPos, nSize );
++            pRecSizes->Insert( nPos, nSize );
+         }
+ 
+         CloseRec( SWG_RECSIZES );
+@@ -1129,9 +1130,9 @@
+     }
+ }
+ 
+-sal_uInt32 Sw3IoImp::OutRecSizes()
++ULONG Sw3IoImp::OutRecSizes()
+ {
+-    sal_uInt32 nRecPos = 0;
++    ULONG nRecPos = 0;
+     if( pRecSizes )
+     {
+         sal_uInt32 nCount = pRecSizes->Count();
+Index: binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.72.1
+diff -u -r1.7 -r1.7.72.1
+--- binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx	8 Sep 2005 10:02:02 -0000	1.7
++++ binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx	28 Apr 2006 08:58:39 -0000	1.7.72.1
+@@ -879,8 +879,8 @@
+ /*N*/ 		if( !pTOXBaseSect || !pTOXBaseSect->GetTOXType() )
+ /*N*/ 			continue;
+ /*N*/ 
+-/*N*/ 		sal_uInt32 nStartIdx = pSectNd->GetIndex();
+-/*N*/ 		sal_uInt32 nEndIdx = pSectNd->EndOfSectionIndex();
++/*N*/ 		ULONG nStartIdx = pSectNd->GetIndex();
++/*N*/ 		ULONG nEndIdx = pSectNd->EndOfSectionIndex();
+ /*N*/ 
+ /*N*/ 		// Skip TOXs that are not contained within the saved area completely.
+ /*N*/ 		if( nStart >= nEndOfIcons && (nStartIdx < nStart || nEndIdx > nEnd) )
+@@ -1000,7 +1000,7 @@
+ 
+ // Die Marks eines Nodes schreiben
+ 
+-/*N*/ void Sw3IoImp::OutNodeMarks( sal_uInt32 nIdx )
++/*N*/ void Sw3IoImp::OutNodeMarks( ULONG nIdx )
+ /*N*/ {
+ /*N*/ 	if(pMarks )
+ /*N*/ 	{
+@@ -2133,7 +2133,7 @@
+ /*N*/ 											   pSectFmt->GetPoolFmtId() );
+ /*N*/ 		const SwSectionFmt *pTitleSectFmt = 0;
+ /*N*/ 
+-/*N*/ 		sal_uInt32 nNextNdIdx = pSectNd->GetIndex() + 1;
++/*N*/ 		ULONG nNextNdIdx = pSectNd->GetIndex() + 1;
+ /*N*/ 		const SwSectionNode *pNextSectNd =
+ /*N*/ 			pDoc->GetNodes()[nNextNdIdx]->GetSectionNode();
+ /*N*/ 			if( pNextSectNd &&
+@@ -2476,8 +2476,12 @@
+ /*N*/ 
+ /*N*/ 	if( IsVersion(SWG_LONGIDX) )
+ /*N*/ 	{
+-/*N*/ 		*pStrm  >> aDocStat.nPage
+-/*N*/ 				>> aDocStat.nPara;
++/*N*/ 		sal_uInt32 nPage, nPara;
++/*N*/ 		*pStrm >> nPage
++/*N*/ 			   >> nPara;
++/*N*/ 
++/*N*/ 		aDocStat.nPage = nPage;
++/*N*/ 		aDocStat.nPara = nPara;
+ /*N*/ 	}
+ /*N*/ 	else
+ /*N*/ 	{
+@@ -2489,9 +2493,12 @@
+ /*N*/ 		aDocStat.nPara = nPara;
+ /*N*/ 	}
+ /*N*/ 
+-/*N*/ 	*pStrm	>> aDocStat.nWord
+-/*N*/ 			>> aDocStat.nChar
+-/*N*/ 			>> c;
++/*N*/ 	sal_uInt32 w;
++/*N*/ 	*pStrm	>> w;
++/*N*/ 	aDocStat.nWord = w;
++/*N*/ 	*pStrm	>> w;
++/*N*/ 	aDocStat.nChar = w;
++/*N*/ 	*pStrm >> c;
+ /*N*/ 
+ /*N*/ 	aDocStat.bModified = c;
+ /*N*/ 
+Index: binfilter/bf_sw/source/core/text/inftxt.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/text/inftxt.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.42.1
+diff -u -r1.5 -r1.5.42.1
+--- binfilter/bf_sw/source/core/text/inftxt.hxx	19 Jan 2006 17:30:31 -0000	1.5
++++ binfilter/bf_sw/source/core/text/inftxt.hxx	28 Apr 2006 08:58:39 -0000	1.5.42.1
+@@ -182,7 +182,7 @@
+  *						class SwTxtSizeInfo
+  *************************************************************************/
+ 
+-DECLARE_TABLE( SwTxtPortionTable, INT32 )
++DECLARE_TABLE( SwTxtPortionTable, sal_IntPtr )
+ 
+ class SwTxtSizeInfo : public SwTxtInfo
+ {
+Index: binfilter/bf_sw/source/core/text/sw_porlay.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/text/sw_porlay.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_sw/source/core/text/sw_porlay.cxx	9 Sep 2005 02:29:52 -0000	1.7
++++ binfilter/bf_sw/source/core/text/sw_porlay.cxx	28 Apr 2006 08:58:39 -0000	1.7.70.1
+@@ -1235,7 +1235,7 @@
+  *                      SwScriptInfo::Compress()
+  *************************************************************************/
+ 
+-/*N*/ long SwScriptInfo::Compress( long* pKernArray, xub_StrLen nIdx, xub_StrLen nLen,
++/*N*/ long SwScriptInfo::Compress( sal_Int32* pKernArray, xub_StrLen nIdx, xub_StrLen nLen,
+ /*N*/                              const USHORT nCompress, const USHORT nFontHeight,
+ /*N*/                              Point* pPoint ) const
+ /*N*/ {
+Index: binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx	9 Sep 2005 02:39:43 -0000	1.6
++++ binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx	27 Apr 2006 16:20:50 -0000	1.6.70.1
+@@ -2271,7 +2271,7 @@
+ /*?*/         {
+ /*?*/             const USHORT nGridWidth = pGrid->GetBaseHeight();
+ /*?*/ 
+-/*?*/             long* pKernArray = new long[rInf.GetLen()];
++/*?*/             sal_Int32* pKernArray = new sal_Int32[rInf.GetLen()];
+ /*?*/             rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
+ /*?*/                                         rInf.GetIdx(), rInf.GetLen() );
+ /*?*/ 
+@@ -2373,7 +2373,7 @@
+ /*N*/ 			nLn = 1;
+ /*N*/ 		else if( nLn > 2 * nTxtBreak )
+ /*N*/ 			nLn = 2 * nTxtBreak;
+-/*N*/ 		long *pKernArray = new long[ nLn ];
++/*N*/ 		sal_Int32 *pKernArray = new sal_Int32[ nLn ];
+ /*N*/ 		rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray,
+ /*N*/ 									rInf.GetIdx(), nLn );
+ /*N*/         if( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn,
+Index: binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx	9 Sep 2005 02:42:05 -0000	1.6
++++ binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx	27 Apr 2006 16:20:50 -0000	1.6.72.1
+@@ -560,12 +560,12 @@
+ /*N*/                 pBreakIt->xBreak->getScriptType( rText, nBegin );
+ /*N*/
+ /*N*/         XubString aTmpWord = rText.Copy( nBegin, aBound.endPos - nBegin );
+-/*N*/         const long nScriptEnd = nBegin +
++/*N*/         const sal_Int32 nScriptEnd = nBegin +
+ /*N*/             pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript );
+-/*N*/         const long nEnd = Min( aBound.endPos, nScriptEnd );
++/*N*/         const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
+ /*N*/
+ /*N*/         // restrict word start to last script change position
+-/*N*/         long nScriptBegin = 0;
++/*N*/         sal_Int32 nScriptBegin = 0;
+ /*N*/         if ( aBound.startPos < nBegin )
+ /*N*/         {
+ /*N*/             // search from nBegin backwards until the next script change
+@@ -583,9 +583,9 @@
+ /*N*/         const USHORT nCurrScript =
+ /*N*/                 pBreakIt->xBreak->getScriptType( rText, aBound.startPos );
+ /*N*/         XubString aTmpWord = rText.Copy( aBound.startPos, aBound.endPos - aBound.startPos );
+-/*N*/         const long nScriptEnd = aBound.startPos +
++/*N*/         const sal_Int32 nScriptEnd = aBound.startPos +
+ /*N*/             pBreakIt->xBreak->endOfScript( aTmpWord, 0, nCurrScript );
+-/*N*/         const long nEnd = Min( aBound.endPos, nScriptEnd );
++/*N*/         const sal_Int32 nEnd = Min( aBound.endPos, nScriptEnd );
+ /*N*/         nBegin = (xub_StrLen)aBound.startPos;
+ /*N*/         nLen = (xub_StrLen)(nEnd - nBegin);
+ /*N*/     }
+Index: binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx	9 Sep 2005 02:52:13 -0000	1.7
++++ binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx	27 Apr 2006 12:34:24 -0000	1.7.70.1
+@@ -894,7 +894,7 @@
+ 		}
+ 
+ 		const SwNodes& rNds = rPam.GetDoc()->GetNodes();
+-		for( sal_uInt32 n = nSttNd; n <= nEndNd; ++n )
++		for( ULONG n = nSttNd; n <= nEndNd; ++n )
+ 		{
+ 			const SwTxtNode* pNd = rNds[ n ]->GetTxtNode();
+ 			if( pNd )
+Index: binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.68.1
+diff -u -r1.5 -r1.5.68.1
+--- binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx	9 Sep 2005 02:52:29 -0000	1.5
++++ binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx	27 Apr 2006 12:36:26 -0000	1.5.68.1
+@@ -1036,7 +1036,7 @@
+ 
+ 			// beim 1.Node traegt der Node die Werte in den GetSet ein (Initial)
+ 			// alle weiteren Nodes werden zum GetSet zu gemergt
+-			for( sal_uInt32 n = nSttNd; n <= nEndNd; ++n )
++			for( ULONG n = nSttNd; n <= nEndNd; ++n )
+ 			{
+ 				SwNode* pNd = rPam.GetDoc()->GetNodes()[ n ];
+ 				switch( pNd->GetNodeType() )
+Index: binfilter/bf_sw/source/core/unocore/sw_unosett.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/core/unocore/sw_unosett.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/core/unocore/sw_unosett.cxx	9 Sep 2005 02:54:44 -0000	1.5
++++ binfilter/bf_sw/source/core/unocore/sw_unosett.cxx	27 Apr 2006 12:33:42 -0000	1.5.72.1
+@@ -1111,7 +1111,7 @@
+ 				{
+ 					INT32 nVal;
+ 					aValue >>= nVal;
+-					aInfo.SetPosFromLeft(Min(MM100_TO_TWIP(nVal), sal_Int32(0xffff)));
++					aInfo.SetPosFromLeft(Min(static_cast<sal_Int32>(MM100_TO_TWIP(nVal)), sal_Int32(0xffff)));
+ 				}
+ 				break;
+ 				case WID_INTERVAL   :
+@@ -1230,7 +1230,7 @@
+ 					sal_uInt32 nPos = rInfo.GetPosFromLeft();
+ 					if(USHRT_MAX == nPos)
+ 						nPos = 0;
+-					aRet <<= TWIP_TO_MM100(nPos);
++					aRet <<= static_cast < sal_Int32 >(TWIP_TO_MM100(nPos));
+ 				}
+ 				break;
+ 				case WID_INTERVAL   :
+@@ -2634,7 +2634,7 @@
+ 	switch(pMap->nWID)
+ 	{
+ 		case WID_TXTCOL_LINE_WIDTH:
+-			aRet <<= TWIP_TO_MM100(nSepLineWidth);
++			aRet <<= static_cast < sal_Int32 >(TWIP_TO_MM100(nSepLineWidth));
+ 		break;
+ 		case WID_TXTCOL_LINE_COLOR:
+ 			aRet <<= nSepLineColor;
+Index: binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_swxml.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_sw/source/filter/xml/sw_swxml.cxx	9 Sep 2005 03:39:48 -0000	1.4
++++ binfilter/bf_sw/source/filter/xml/sw_swxml.cxx	27 Apr 2006 10:32:10 -0000	1.4.72.1
+@@ -427,7 +427,7 @@
+ }
+ 
+ 
+-sal_uInt32 XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
++ULONG XMLReader::Read( SwDoc &rDoc, SwPaM &rPaM, const String & rName )
+ {
+ 	// Get service factory
+ 	Reference< lang::XMultiServiceFactory > xServiceFactory =
+@@ -587,7 +587,7 @@
+     }
+ 
+ 	rDoc.AddLink();	// prevent deletion
+-	sal_uInt32 nRet = 0;
++	ULONG nRet = 0;
+ 
+ 	// save redline mode into import info property set
+ 	Any aAny;
+Index: binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx	9 Sep 2005 03:40:15 -0000	1.4
++++ binfilter/bf_sw/source/filter/xml/sw_wrtxml.cxx	27 Apr 2006 10:35:38 -0000	1.4.72.1
+@@ -441,12 +441,12 @@
+ 	return 0;
+ }
+ 
+-sal_uInt32 SwXMLWriter::WriteStorage()
++ULONG SwXMLWriter::WriteStorage()
+ {
+ 	return _Write();
+ }
+ 
+-sal_uInt32 SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
++ULONG SwXMLWriter::Write( SwPaM& rPaM, SfxMedium& rMed,
+ 							   const String* pFileName )
+ {
+ 	return IsStgWriter()
+Index: binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.72.1
+diff -u -r1.7 -r1.7.72.1
+--- binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx	9 Sep 2005 03:41:46 -0000	1.7
++++ binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx	27 Apr 2006 10:33:19 -0000	1.7.72.1
+@@ -710,7 +710,7 @@
+ 		if( !pPos->nContent.GetIndex() )
+ 		{
+ 			SwTxtNode* pCurrNd;
+-			sal_uInt32 nNodeIdx = pPos->nNode.GetIndex();
++			ULONG nNodeIdx = pPos->nNode.GetIndex();
+ 			pDoc = pPaM->GetDoc();
+ 
+ 			DBG_ASSERT( pPos->nNode.GetNode().IsCntntNode(),
+Index: binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx	9 Sep 2005 03:41:59 -0000	1.6
++++ binfilter/bf_sw/source/filter/xml/sw_xmlimpit.cxx	27 Apr 2006 10:40:50 -0000	1.6.70.1
+@@ -777,7 +777,7 @@
+                         }
+                         else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
+                         {
+-                            long nPrc = 50;
++                            sal_Int32 nPrc = 50;
+                             if( rUnitConverter.convertPercent( nPrc, aToken ) )
+                             {
+                                 if( !bHori )
+Index: binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx	9 Sep 2005 03:43:09 -0000	1.5
++++ binfilter/bf_sw/source/filter/xml/sw_xmlithlp.cxx	27 Apr 2006 10:39:47 -0000	1.5.72.1
+@@ -203,7 +203,7 @@
+     rWidth = 0;
+     rNamedWidth = USHRT_MAX;
+ 
+-    long nTemp;
++    sal_Int32 nTemp;
+     while( aTokens.getNextToken( aToken ) && aToken.getLength() != 0 )
+     {
+         if( !rHasWidth &&
+Index: binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx	9 Sep 2005 03:44:06 -0000	1.7
++++ binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx	27 Apr 2006 10:38:23 -0000	1.7.70.1
+@@ -677,7 +677,7 @@
+ 				pColumn->SetWidthOpt( (sal_uInt16)nColAbsWidth, sal_False );
+ 			}
+ 
+-			sal_uInt32 nExpPos = 0;
++			ULONG nExpPos = 0;
+ 			if( rExpCols.Seek_Entry( pColumn, &nExpPos ) )
+ 			{
+ 				pColumn->SetStyleName(
+Index: binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx,v
+retrieving revision 1.7
+retrieving revision 1.7.70.1
+diff -u -r1.7 -r1.7.70.1
+--- binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx	9 Sep 2005 03:45:02 -0000	1.7
++++ binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx	27 Apr 2006 10:37:22 -0000	1.7.70.1
+@@ -175,7 +175,7 @@
+ };
+ static void lcl_putHeightAndWidth ( SfxItemSet &rItemSet, 
+ 		sal_Int32 nHeight, sal_Int32 nWidth,
+-		sal_Int32 *pTwipHeight=0, sal_Int32 *pTwipWidth=0 )
++		long *pTwipHeight=0, long *pTwipWidth=0 )
+ {
+ 	if( nWidth > 0 && nHeight > 0 )
+ 	{
+Index: binfilter/bf_sw/source/filter/xml/wrtxml.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/filter/xml/wrtxml.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_sw/source/filter/xml/wrtxml.hxx	9 Sep 2005 03:45:15 -0000	1.3
++++ binfilter/bf_sw/source/filter/xml/wrtxml.hxx	27 Apr 2006 10:35:17 -0000	1.3.72.1
+@@ -67,7 +67,7 @@
+ 	sal_uInt32 _Write();
+ 
+ protected:
+-	virtual sal_uInt32 WriteStorage();
++	virtual ULONG WriteStorage();
+ 
+ public:
+ 
+Index: binfilter/bf_sw/source/ui/inc/view.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_sw/source/ui/inc/view.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.38.1
+diff -u -r1.5 -r1.5.38.1
+--- binfilter/bf_sw/source/ui/inc/view.hxx	19 Jan 2006 17:30:50 -0000	1.5
++++ binfilter/bf_sw/source/ui/inc/view.hxx	27 Apr 2006 13:37:16 -0000	1.5.38.1
+@@ -408,7 +408,7 @@
+ 	SfxDispatcher 	&GetDispatcher();
+ 
+ //STRIP001 	virtual SdrView*		GetDrawView() const;
+-	virtual	BOOL			HasUIFeature( ULONG nFeature );
++	virtual	BOOL			HasUIFeature( sal_uInt32 nFeature );
+ 	virtual	void			ShowCursor( FASTBOOL bOn = TRUE );
+ //STRIP001 	virtual ErrCode			DoVerb( long nVerb );
+ 
+Index: binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx	9 Sep 2005 07:46:00 -0000	1.3
++++ binfilter/bf_xmloff/source/core/xmloff_xmlehelp.cxx	28 Apr 2006 08:58:40 -0000	1.3.72.1
+@@ -58,7 +58,7 @@
+ using namespace ::rtl;
+ using namespace ::binfilter::xmloff::token;
+ 
+-void SvXMLExportHelper::AddLength( long nValue, MapUnit eValueUnit,
++void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit,
+ 		   			  	   		   OUStringBuffer& rOut,
+ 								   MapUnit eOutUnit )
+ {
+@@ -70,9 +70,9 @@
+ 	}
+ 	
+ 	// The new length is (nVal * nMul)/(nDiv*nFac*10)
+-	long nMul = 1000;
+-	long nDiv = 1;
+-	long nFac = 100;
++	sal_Int32 nMul = 1000;
++	sal_Int32 nDiv = 1;
++	sal_Int32 nFac = 100;
+ 	enum XMLTokenEnum eUnit = XML_TOKEN_INVALID;
+ 	switch( eValueUnit )
+ 	{
+@@ -176,9 +176,9 @@
+ 	}
+ 
+ 
+-	long nLongVal;
++	sal_Int32 nLongVal;
+ 	BOOL bOutLongVal = TRUE;
+-	if( nValue > LONG_MAX / nMul )
++	if( nValue > SAL_MAX_INT32 / nMul )
+ 	{
+ 		// A big int is required for calculation
+ 		BigInt nBigVal( nValue );
+@@ -190,8 +190,8 @@
+ 
+ 		if( nBigVal.IsLong() )
+ 		{
+-			// To convert the value into a string a long is sufficient
+-			nLongVal = (long)nBigVal;
++			// To convert the value into a string a sal_Int32 is sufficient
++			nLongVal = (sal_Int32)nBigVal;
+ 		}
+ 		else
+ 		{
+@@ -313,7 +313,7 @@
+ 
+ }
+ 
+-void SvXMLExportHelper::AddPercentage( long nValue, OUStringBuffer& rOut )
++void SvXMLExportHelper::AddPercentage( sal_Int32 nValue, OUStringBuffer& rOut )
+ {
+ 	rOut.append( nValue );
+ 	rOut.append( sal_Unicode('%' ) );
+Index: binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx	9 Sep 2005 07:48:30 -0000	1.3
++++ binfilter/bf_xmloff/source/core/xmloff_xmluconv.cxx	28 Apr 2006 08:58:40 -0000	1.3.70.1
+@@ -931,7 +931,7 @@
+             bDone = sal_True;
+         else if ( sal_Unicode('0') <= c && sal_Unicode('9') >= c )
+         {
+-            if ( nTemp >= LONG_MAX / 10 )
++            if ( nTemp >= SAL_MAX_INT32 / 10 )
+                 bSuccess = sal_False;
+             else
+             {
+Index: binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.10.1
+diff -u -r1.4 -r1.4.10.1
+--- binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx	7 Apr 2006 13:33:38 -0000	1.4
++++ binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx	28 Apr 2006 08:58:40 -0000	1.4.10.1
+@@ -328,7 +328,7 @@
+             bDone = sal_True;
+         else if ( sal_Unicode('0') <= c && sal_Unicode('9') >= c )
+         {
+-            if ( nTemp >= LONG_MAX / 10 )
++            if ( nTemp >= SAL_MAX_INT32 / 10 )
+                 bSuccess = sal_False;
+             else
+             {
+Index: binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx	9 Sep 2005 09:42:20 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_XMLBackgroundImageContext.cxx	27 Apr 2006 12:45:03 -0000	1.3.70.1
+@@ -248,7 +248,7 @@
+ 					}
+ 					else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
+ 					{
+-						long nPrc = 50;
++						sal_Int32 nPrc = 50;
+ 						if( rUnitConverter.convertPercent( nPrc, aToken ) )
+ 						{
+ 							if( !bHori )
+Index: binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx	9 Sep 2005 09:44:45 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_XMLFontAutoStylePool.cxx	27 Apr 2006 12:47:21 -0000	1.3.72.1
+@@ -196,7 +196,7 @@
+ 	OUString sName;
+ 	XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
+ 									 	 nPitch, eEnc );
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	if( pPool->Seek_Entry( &aTmp, &nPos ) )
+ 	{
+ 		sName = pPool->GetObject( nPos )->GetName();
+@@ -250,7 +250,7 @@
+ 	OUString sName;
+ 	XMLFontAutoStylePoolEntry_Impl aTmp( rFamilyName, rStyleName, nFamily,
+ 									 	 nPitch, eEnc );
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	if( pPool->Seek_Entry( &aTmp, &nPos ) )
+ 	{
+ 		sName = pPool->GetObject( nPos )->GetName();
+Index: binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx	9 Sep 2005 09:47:12 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_backhdl.cxx	27 Apr 2006 12:54:39 -0000	1.3.72.1
+@@ -107,7 +107,7 @@
+ 		}
+ 		else if( -1 != aToken.indexOf( sal_Unicode('%') ) )
+ 		{
+-			long nPrc = 50;
++			sal_Int32 nPrc = 50;
+ 			if( rUnitConverter.convertPercent( nPrc, aToken ) )
+ 			{
+ 				if( !bHori )
+Index: binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx	9 Sep 2005 09:47:29 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_bordrhdl.cxx	27 Apr 2006 12:54:39 -0000	1.3.72.1
+@@ -355,7 +355,7 @@
+ 	sal_uInt16 nNamedWidth = USHRT_MAX;
+ 	Color aColor;
+ 
+-	long nTemp;
++	sal_Int32 nTemp;
+ 	while( aTokens.getNextToken( aToken ) && aToken.getLength() != 0 )
+ 	{
+ 		if( !bHasWidth &&
+Index: binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx	9 Sep 2005 09:50:58 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_impastp4.cxx	27 Apr 2006 12:54:39 -0000	1.3.72.1
+@@ -110,7 +110,7 @@
+ 		sal_Bool bAsFamily )
+ {
+ 	// store family in a list if not already stored
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl *pFamily = new XMLFamilyData_Impl( nFamily, rStrName, rMapper, rStrPrefix, bAsFamily );
+ 	if( !maFamilyList.Seek_Entry( pFamily, &nPos ) )
+ 		maFamilyList.Insert( pFamily );
+@@ -127,7 +127,7 @@
+ {
+ 	SvXMLAutoStylePoolNamesP_Impl *pNames = 0;
+ 
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+ 	if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
+ 		pNames = maFamilyList.GetObject( nPos )->mpNameList;
+@@ -158,7 +158,7 @@
+ 				sal_Bool bCache)
+ {
+ 	sal_Bool bRet(sal_False);
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+@@ -206,7 +206,7 @@
+ OUString SvXMLAutoStylePoolP_Impl::AddToCache( sal_Int32 nFamily,
+ 							 		    const OUString& rParent )
+ {
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+@@ -238,7 +238,7 @@
+ {
+ 	OUString sName;
+ 
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
+@@ -265,7 +265,7 @@
+ {
+ 	OUString sName;
+ 
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
+@@ -307,7 +307,7 @@
+ 	sal_uInt32 nCount = 0;
+ 
+ 	// Get list of parents for current family (nFamily)
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	XMLFamilyData_Impl aTmp( nFamily );
+ 	XMLFamilyData_Impl *pFamily = 0;
+ 	if( maFamilyList.Seek_Entry( &aTmp, &nPos ) )
+Index: binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx	9 Sep 2005 09:58:11 -0000	1.3
++++ binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx	28 Apr 2006 08:58:41 -0000	1.3.70.1
+@@ -758,11 +758,11 @@
+ 			sVerticalRel = rValue;
+ 			break;
+ 		case XML_TOK_STYLE_ATTRIBUTES_ATTR_WIDTH:
+-			if( rUnitConv.convertMeasure( nVal, rValue, 0, LONG_MAX ) )
++			if( rUnitConv.convertMeasure( nVal, rValue, 0, SAL_MAX_INT32 ) )
+ 				rListLevel.SetImageWidth( nVal );
+ 			break;
+ 		case XML_TOK_STYLE_ATTRIBUTES_ATTR_HEIGHT:
+-			if( rUnitConv.convertMeasure( nVal, rValue, 0, LONG_MAX ) )
++			if( rUnitConv.convertMeasure( nVal, rValue, 0, SAL_MAX_INT32 ) )
+ 				rListLevel.SetImageHeight( nVal );
+ 			break;
+ 		case XML_TOK_STYLE_ATTRIBUTES_ATTR_COLOR:
+Index: binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx,v
+retrieving revision 1.4
+retrieving revision 1.4.70.1
+diff -u -r1.4 -r1.4.70.1
+--- binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx	9 Sep 2005 09:59:15 -0000	1.4
++++ binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx	27 Apr 2006 12:54:39 -0000	1.4.70.1
+@@ -459,7 +459,7 @@
+ 	if( pIndices )
+ 	{
+ 		SvXMLStyleIndex_Impl aIndex( nFamily, rName );
+-		sal_uInt32 nPos = 0;
++		ULONG nPos = 0;
+ 		if( pIndices->Seek_Entry( &aIndex, &nPos ) )
+ 			pStyle = pIndices->GetObject( nPos )->GetStyle();
+ 	}
+Index: binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx
+===================================================================
+RCS file: /cvs/framework/binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx	9 Sep 2005 10:31:16 -0000	1.3
++++ binfilter/bf_xmloff/source/text/xmloff_XMLTextListAutoStylePool.cxx	27 Apr 2006 15:53:55 -0000	1.3.72.1
+@@ -226,7 +226,7 @@
+ 
+ sal_uInt32 XMLTextListAutoStylePool::Find( XMLTextListAutoStylePoolEntry_Impl* pEntry ) const
+ {
+-	sal_uInt32 nPos;
++	ULONG nPos;
+ 	if( !pEntry->IsNamed() && mxNumRuleCompare.is() )
+ 	{
+ 		const sal_uInt32 nCount = pPool->Count();
+Index: binfilter/inc/bf_sc/appoptio.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sc/appoptio.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/inc/bf_sc/appoptio.hxx	9 Sep 2005 10:56:59 -0000	1.5
++++ binfilter/inc/bf_sc/appoptio.hxx	27 Apr 2006 16:28:36 -0000	1.5.72.1
+@@ -85,14 +85,14 @@
+ 	void		SetDetectiveAuto( BOOL bNew )	{ bDetectiveAuto = bNew; }
+ 	BOOL		GetDetectiveAuto() const		{ return bDetectiveAuto; }
+ 
+-	void		SetTrackContentColor(ULONG nNew) { nTrackContentColor = nNew; }
+-	ULONG		GetTrackContentColor() const	 { return nTrackContentColor; }
+-	void		SetTrackInsertColor(ULONG nNew)	 { nTrackInsertColor = nNew;  }
+-	ULONG		GetTrackInsertColor() const		 { return nTrackInsertColor;  }
+-	void		SetTrackDeleteColor(ULONG nNew)	 { nTrackDeleteColor = nNew;  }
+-	ULONG		GetTrackDeleteColor() const		 { return nTrackDeleteColor;  }
+-	void		SetTrackMoveColor(ULONG nNew)	 { nTrackMoveColor = nNew;    }
+-	ULONG		GetTrackMoveColor() const		 { return nTrackMoveColor;    }
++	void		SetTrackContentColor(sal_uInt32 nNew) { nTrackContentColor = nNew; }
++	sal_uInt32	GetTrackContentColor() const	 { return nTrackContentColor; }
++	void		SetTrackInsertColor(sal_uInt32 nNew)	 { nTrackInsertColor = nNew;  }
++	sal_uInt32	GetTrackInsertColor() const		 { return nTrackInsertColor;  }
++	void		SetTrackDeleteColor(sal_uInt32 nNew)	 { nTrackDeleteColor = nNew;  }
++	sal_uInt32	GetTrackDeleteColor() const		 { return nTrackDeleteColor;  }
++	void		SetTrackMoveColor(sal_uInt32 nNew)	 { nTrackMoveColor = nNew;    }
++	sal_uInt32	GetTrackMoveColor() const		 { return nTrackMoveColor;    }
+ 
+ 	ScLkUpdMode GetLinkMode() const				{ return eLinkMode ;}
+ 	void		SetLinkMode( ScLkUpdMode nSet )	{ 	eLinkMode  = nSet;}
+@@ -116,10 +116,10 @@
+ 	USHORT		nStatusFunc;
+ 	BOOL		bAutoComplete;
+ 	BOOL		bDetectiveAuto;
+-	ULONG		nTrackContentColor;
+-	ULONG		nTrackInsertColor;
+-	ULONG		nTrackDeleteColor;
+-	ULONG		nTrackMoveColor;
++	sal_uInt32	nTrackContentColor;
++	sal_uInt32	nTrackInsertColor;
++	sal_uInt32	nTrackDeleteColor;
++	sal_uInt32	nTrackMoveColor;
+ 	ScLkUpdMode eLinkMode;
+ 	INT32		nDefaultObjectSizeWidth;
+ 	INT32		nDefaultObjectSizeHeight;
+Index: binfilter/inc/bf_sc/conditio.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sc/conditio.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_sc/conditio.hxx	9 Sep 2005 11:03:32 -0000	1.3
++++ binfilter/inc/bf_sc/conditio.hxx	27 Apr 2006 11:27:33 -0000	1.3.72.1
+@@ -206,13 +206,13 @@
+ {
+ 	ScDocument*			pDoc;
+ 	ScRangeList*		pAreas;				// Bereiche fuer Paint
+-	ULONG				nKey;				// Index in Attributen
++	sal_uInt32			nKey;				// Index in Attributen
+ 	ScCondFormatEntry**	ppEntries;
+ 	USHORT				nEntryCount;
+ 	BOOL				bIsUsed;			// temporaer beim Speichern
+ 
+ public:
+-			ScConditionalFormat(ULONG nNewKey, ScDocument* pDocument);
++			ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument);
+ 			ScConditionalFormat(const ScConditionalFormat& r);
+ 			ScConditionalFormat(SvStream& rStream, ScMultipleReadHeader& rHdr,
+ 								ScDocument* pDocument);
+@@ -245,8 +245,8 @@
+ 	void			DoRepaint( const ScRange* pModified );
+ 	void			InvalidateArea();
+ 
+-	ULONG			GetKey() const			{ return nKey; }
+-	void			SetKey(ULONG nNew)		{ nKey = nNew; }	// nur wenn nicht eingefuegt!
++	sal_uInt32		GetKey() const			{ return nKey; }
++	void			SetKey(sal_uInt32 nNew)	{ nKey = nNew; }	// nur wenn nicht eingefuegt!
+ 
+ 	void			SetUsed(BOOL bSet)		{ bIsUsed = bSet; }
+ 	BOOL			IsUsed() const			{ return bIsUsed; }
+@@ -277,7 +277,7 @@
+ 	void	InsertNew( ScConditionalFormat* pNew )
+ 				{ if (!Insert(pNew)) delete pNew; }
+ 
+-	ScConditionalFormat* GetFormat( ULONG nKey );
++	ScConditionalFormat* GetFormat( sal_uInt32 nKey );
+ 
+ 	void	Load( SvStream& rStream, ScDocument* pDocument );
+ 	void	Store( SvStream& rStream ) const;
+Index: binfilter/inc/bf_sc/document.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sc/document.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.52.1
+diff -u -r1.6 -r1.6.52.1
+--- binfilter/inc/bf_sc/document.hxx	14 Dec 2005 14:34:42 -0000	1.6
++++ binfilter/inc/bf_sc/document.hxx	27 Apr 2006 13:17:57 -0000	1.6.52.1
+@@ -759,7 +759,7 @@
+ 	void			GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue );
+ 	double			RoundValueAsShown( double fVal, ULONG nFormat );
+ 	void			GetNumberFormat( USHORT nCol, USHORT nRow, USHORT nTab,
+-									 ULONG& rFormat );
++									 sal_uInt32& rFormat );
+ 	ULONG			GetNumberFormat( const ScAddress& ) const;
+ 					/// if no number format attribute is set the calculated
+ 					/// number format of the formula cell is returned
+Index: binfilter/inc/bf_sc/rechead.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sc/rechead.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_sc/rechead.hxx	9 Sep 2005 11:24:36 -0000	1.3
++++ binfilter/inc/bf_sc/rechead.hxx	27 Apr 2006 16:28:36 -0000	1.3.72.1
+@@ -158,10 +158,10 @@
+ private:
+ 	SvStream&	rStream;
+ 	ULONG		nDataPos;
+-	ULONG		nDataSize;
++	sal_uInt32	nDataSize;
+ 
+ public:
+-	ScWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
++	ScWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
+ 	~ScWriteHeader();
+ };
+ 
+@@ -192,11 +192,11 @@
+ 	SvStream&		rStream;
+ 	SvMemoryStream	aMemStream;
+ 	ULONG			nDataPos;
+-	ULONG			nDataSize;
++	sal_uInt32		nDataSize;
+ 	ULONG			nEntryStart;
+ 
+ public:
+-	ScMultipleWriteHeader(SvStream& rNewStream, ULONG nDefault = 0);
++	ScMultipleWriteHeader(SvStream& rNewStream, sal_uInt32 nDefault = 0);
+ 	~ScMultipleWriteHeader();
+ 
+ 	void	StartEntry();
+Index: binfilter/inc/bf_sc/validat.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sc/validat.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_sc/validat.hxx	9 Sep 2005 11:36:11 -0000	1.3
++++ binfilter/inc/bf_sc/validat.hxx	27 Apr 2006 11:37:03 -0000	1.3.72.1
+@@ -70,7 +70,7 @@
+ 
+ class ScValidationData : public ScConditionEntry
+ {
+-	ULONG				nKey;				// Index in Attributen
++	sal_uInt32			nKey;				// Index in Attributen
+ 
+ 	ScValidationMode	eDataMode;
+ 	BOOL				bShowInput;
+@@ -132,8 +132,8 @@
+ //STRIP001 	void			DoCalcError( ScFormulaCell* pCell ) const;
+ 
+ 	BOOL			IsEmpty() const;
+-	ULONG			GetKey() const			{ return nKey; }
+-	void			SetKey(ULONG nNew)		{ nKey = nNew; }	// nur wenn nicht eingefuegt!
++	sal_uInt32		GetKey() const			{ return nKey; }
++	void			SetKey(sal_uInt32 nNew)		{ nKey = nNew; }	// nur wenn nicht eingefuegt!
+ 
+ 	void			SetUsed(BOOL bSet)		{ bIsUsed = bSet; }
+ 	BOOL			IsUsed() const			{ return bIsUsed; }
+@@ -166,7 +166,7 @@
+ 	void	InsertNew( ScValidationData* pNew )
+ 				{ if (!Insert(pNew)) delete pNew; }
+ 
+-	ScValidationData* GetData( ULONG nKey );
++	ScValidationData* GetData( sal_uInt32 nKey );
+ 
+ 	void	Load( SvStream& rStream, ScDocument* pDocument );
+ 	void	Store( SvStream& rStream ) const;
+Index: binfilter/inc/bf_sch/memchrt.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sch/memchrt.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.72.1
+diff -u -r1.6 -r1.6.72.1
+--- binfilter/inc/bf_sch/memchrt.hxx	9 Sep 2005 11:48:05 -0000	1.6
++++ binfilter/inc/bf_sch/memchrt.hxx	27 Apr 2006 11:05:12 -0000	1.6.72.1
+@@ -194,12 +194,12 @@
+ 
+ 	// number formatter and format id
+ 	SvNumberFormatter*  mpNumFormatter;
+-	long *pRowNumFmtId;
+-	long *pColNumFmtId;
++	sal_Int32 *pRowNumFmtId;
++	sal_Int32 *pColNumFmtId;
+ 
+ 	// translation table for row-/column reordering (internal)
+-	long *pRowTable;
+-	long *pColTable;
++	sal_Int32 *pRowTable;
++	sal_Int32 *pColTable;
+ 	ChartSelectionInfo aSelectionInfo;
+ 
+ 	// is not copied in copy contrustor (?)
+@@ -263,49 +263,49 @@
+ 	// methods for translation of data
+ //STRIP001 	BOOL TransCol(long nCol,BOOL bUp=TRUE);
+ //STRIP001 	BOOL TransRow(long nRow,BOOL bUp=TRUE);
+-	inline void ResetTranslation(long *pTable,long nCnt);
++	inline void ResetTranslation(sal_Int32 *pTable,long nCnt);
+ 	BOOL VerifyTranslation();
+ 	long GetTranslation() const { return nTranslated; }
+-	inline void UpdateTranslation(long *pTable,long nCnt);
++	inline void UpdateTranslation(sal_Int32 *pTable,long nCnt);
+ 	// for acces always use these Get-methods !
+ 	double GetTransData(long nCol,long nRow);
+ 	double GetTransDataInPercent(long nCol ,long nRow,BOOL bRowData) const;
+ 	const String& GetTransColText(long nCol) const;
+ 	const String& GetTransRowText(long nRow) const;
+ 
+-	const long *GetRowTranslation() const { return pRowTable; }
+-	const long *GetColTranslation() const { return pColTable; }
++	const sal_Int32 *GetRowTranslation() const { return pRowTable; }
++	const sal_Int32 *GetColTranslation() const { return pColTable; }
+ 
+ #ifdef SCH_COPY_HACK
+-	const long* GetRowNumFmtTable() const { return pRowNumFmtId; }
+-	const long* GetColNumFmtTable() const { return pColNumFmtId; }
++	const sal_Int32* GetRowNumFmtTable() const { return pRowNumFmtId; }
++	const sal_Int32* GetColNumFmtTable() const { return pColNumFmtId; }
+ 
+ 	// ********************
+ 	// BM: Fix for #68864#
+ 	// Use these four methods with care! The arrays MUST have the correct size!
+ 	// ********************
+-	void SetRowTranslation( const long* pTransTable )
++	void SetRowTranslation( const sal_Int32* pTransTable )
+ 	{
+ 		if( !pRowTable ) return;
+-		for( long i=0; i<nRowCnt; i++ )
++		for( sal_Int32 i=0; i<nRowCnt; i++ )
+ 			pRowTable[ i ] = pTransTable[ i ];
+ 	}
+-	void SetColTranslation( const long* pTransTable )
++	void SetColTranslation( const sal_Int32* pTransTable )
+ 	{
+ 		if( !pColTable ) return;
+-		for( long i=0; i<nColCnt; i++ )
++		for( sal_Int32 i=0; i<nColCnt; i++ )
+ 			pColTable[ i ] = pTransTable[ i ];
+ 	}
+-	void SetRowNumFmtTable( const long* pNumFmtTable )
++	void SetRowNumFmtTable( const sal_Int32* pNumFmtTable )
+ 	{
+ 		if( !pRowNumFmtId ) return;
+-		for( long i=0; i<nRowCnt; i++ )
++		for( sal_Int32 i=0; i<nRowCnt; i++ )
+ 			pRowNumFmtId[ i ] = pNumFmtTable[ i ];
+ 	}
+-	void SetColNumFmtTable( const long* pNumFmtTable )
++	void SetColNumFmtTable( const sal_Int32* pNumFmtTable )
+ 	{
+ 		if( !pColNumFmtId ) return;
+-		for( long i=0; i<nColCnt; i++ )
++		for( sal_Int32 i=0; i<nColCnt; i++ )
+ 			pColNumFmtId[ i ] = pNumFmtTable[ i ];
+ 	}
+ 	// this is only valid if the corresponding translation table was set correctly!
+@@ -481,7 +481,7 @@
+ 
+ // ==================== Inline Implementations ====================
+ 
+-inline void SchMemChart::ResetTranslation(long *pTable,long nCnt)
++inline void SchMemChart::ResetTranslation(sal_Int32 *pTable,long nCnt)
+ {
+ 	long i;
+ 	if(pTable)
+@@ -494,12 +494,13 @@
+ 		nTranslated=TRANS_NONE;
+ }
+ 
+-inline void SchMemChart::UpdateTranslation(long *pTable,long nCnt)
++inline void SchMemChart::UpdateTranslation(sal_Int32 *pTable,long nCnt)
+ {
+ 	if( (pTable==pRowTable && nTranslated==TRANS_ROW)
+ 	  ||(pTable==pColTable && nTranslated==TRANS_COL))
+ 	{
+-		long i,nMax=0;
++		long i;
++		sal_Int32 nMax=0;
+ 		for(i=0;i<nCnt;i++)
+ 			nMax=Max(nMax,pTable[i]);
+ 
+@@ -588,11 +589,11 @@
+ 	delete[] pOldData;
+ 
+ 	String *pOldColText     = pColText;
+-	long   *pOldColNumFmtId = pColNumFmtId;
+-	long   *pOldColTable    = pColTable;
++	sal_Int32 *pOldColNumFmtId = pColNumFmtId;
++	sal_Int32 *pOldColTable    = pColTable;
+ 
+-	pColNumFmtId	= new long  [nNewColCnt];
+-	pColTable		= new long  [nNewColCnt];
++	pColNumFmtId	= new sal_Int32 [nNewColCnt];
++	pColTable		= new sal_Int32 [nNewColCnt];
+ 	pColText		= new String[nNewColCnt];
+ 
+ 	long nC=nNewColCnt;
+@@ -636,12 +637,12 @@
+ 	pData = new double[nNewColCnt * nRowCnt];
+ 
+ 	String* pOldColText		= pColText;
+-	long*   pOldColNumFmtId	= pColNumFmtId;
+-	long*   pOldColTable	= pColTable;
++	sal_Int32* pOldColNumFmtId	= pColNumFmtId;
++	sal_Int32* pOldColTable	= pColTable;
+ 
+ 	pColText		= new String[nNewColCnt];
+-	pColNumFmtId	= new long  [nNewColCnt];
+-	pColTable		= new long  [nNewColCnt];
++	pColNumFmtId	= new sal_Int32 [nNewColCnt];
++	pColTable		= new sal_Int32 [nNewColCnt];
+ 
+ 	short i, j, nOld;
+ 
+@@ -710,11 +711,11 @@
+ 	delete[] pOldData;
+ 
+ 	String *pOldRowText     =pRowText;
+-	long   *pOldRowNumFmtId =pRowNumFmtId;
+-	long   *pOldRowTable    =pRowTable;
++	sal_Int32 *pOldRowNumFmtId =pRowNumFmtId;
++	sal_Int32 *pOldRowTable    =pRowTable;
+ 
+-	pRowNumFmtId	= new long  [nNewRowCnt];
+-	pRowTable		= new long  [nNewRowCnt];
++	pRowNumFmtId	= new sal_Int32 [nNewRowCnt];
++	pRowTable		= new sal_Int32 [nNewRowCnt];
+ 	pRowText        = new String[nNewRowCnt];
+ 
+ 	long nC=nNewRowCnt;
+@@ -773,12 +774,12 @@
+ 	delete[] pOldData;
+ 
+ 	String* pOldRowText		= pRowText;
+-	long*   pOldRowNumFmtId	= pRowNumFmtId;
+-	long*   pOldRowTable	= pRowTable;
++	sal_Int32*   pOldRowNumFmtId	= pRowNumFmtId;
++	sal_Int32*   pOldRowTable	= pRowTable;
+ 
+ 	pRowText		= new String[nNewRowCnt];
+-	pRowNumFmtId	= new long  [nNewRowCnt];
+-	pRowTable		= new long  [nNewRowCnt];
++	pRowNumFmtId	= new sal_Int32 [nNewRowCnt];
++	pRowTable		= new sal_Int32 [nNewRowCnt];
+ 
+ 	for (i = 0, nOld = 0;; i++, nOld++)
+ 	{
+Index: binfilter/inc/bf_sd/drawdoc.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sd/drawdoc.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.10.1
+diff -u -r1.5 -r1.5.10.1
+--- binfilter/inc/bf_sd/drawdoc.hxx	7 Apr 2006 13:37:44 -0000	1.5
++++ binfilter/inc/bf_sd/drawdoc.hxx	27 Apr 2006 12:06:47 -0000	1.5.10.1
+@@ -169,7 +169,7 @@
+ 	BOOL			    bPresLockedPages;
+ 	BOOL			    bPresAlwaysOnTop;
+ 	BOOL                bPresFullScreen;
+-	ULONG			    nPresPause;
++	sal_uInt32		    nPresPause;
+ 	BOOL			    bPresShowLogo;
+ 	BOOL			    bOnlineSpell;
+ 	BOOL			    bHideSpell;
+@@ -177,7 +177,7 @@
+     BOOL                bSummationOfParagraphs;
+ 	bool				mbStartWithPresentation;		// is set to true when starting with command line parameter -start
+ 
+-	ULONG			    nPresFirstPage;
++	sal_uInt32		    nPresFirstPage;
+ 	LanguageType	    eLanguage;
+ 	LanguageType	    eLanguageCJK;
+ 	LanguageType	    eLanguageCTL;
+@@ -363,8 +363,8 @@
+ 	void                SetAnimationAllowed (BOOL bAllowed) { bAnimationAllowed = bAllowed; }
+ 	BOOL                IsAnimationAllowed() const { return bAnimationAllowed; }
+ 
+-	void                SetPresPause( ULONG nSecondsToWait ) { nPresPause = nSecondsToWait; }
+-	ULONG               GetPresPause() const { return nPresPause; }
++	void                SetPresPause( sal_uInt32 nSecondsToWait ) { nPresPause = nSecondsToWait; }
++	sal_uInt32          GetPresPause() const { return nPresPause; }
+ 
+ 	void                SetPresShowLogo( BOOL bShowLogo ) { bPresShowLogo = bShowLogo; }
+ 	BOOL                IsPresShowLogo() const { return bPresShowLogo; }
+Index: binfilter/inc/bf_sfx2/dispatch.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sfx2/dispatch.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_sfx2/dispatch.hxx	9 Sep 2005 12:12:58 -0000	1.3
++++ binfilter/inc/bf_sfx2/dispatch.hxx	27 Apr 2006 14:55:06 -0000	1.3.72.1
+@@ -139,7 +139,7 @@
+ 	DECL_LINK( PostMsgHandler, SfxRequest * );
+ 
+ 	int 				Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord );
+-	ULONG               _Update_Impl( BOOL,BOOL,BOOL,SfxMenuBarManager*,SfxWorkWindow*);
++	sal_uInt32          _Update_Impl( BOOL,BOOL,BOOL,SfxMenuBarManager*,SfxWorkWindow*);
+ 	void				CollectTools_Impl(SfxWorkWindow*);
+ 
+ protected:
+@@ -234,8 +234,8 @@
+ 
+ 	BOOL                IsAllowed( USHORT nSlot ) const;
+     ::com::sun::star::frame::XDispatch*          GetDispatchInterface( const String& );
+-	void				SetDisableFlags( ULONG nFlags );
+-	ULONG				GetDisableFlags() const;
++	void				SetDisableFlags( sal_uInt32 nFlags );
++	sal_uInt32			GetDisableFlags() const;
+ 
+ #if _SOLAR__PRIVATE
+ 	BOOL				HasSlot_Impl( USHORT );
+Index: binfilter/inc/bf_sfx2/docinf.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sfx2/docinf.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/inc/bf_sfx2/docinf.hxx	9 Sep 2005 12:14:19 -0000	1.5
++++ binfilter/inc/bf_sfx2/docinf.hxx	27 Apr 2006 15:36:59 -0000	1.5.72.1
+@@ -130,7 +130,7 @@
+ 	String   aDefaultTarget;
+ 	String   aReloadURL;
+ 	BOOL     bReloadEnabled;
+-	ULONG    nReloadSecs;
++	sal_uInt32 nReloadSecs;
+ 
+ 	DateTime aTemplateDate;	// Stamp der Dokumentvorlage
+ 
+Index: binfilter/inc/bf_sfx2/viewfrm.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sfx2/viewfrm.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.70.1
+diff -u -r1.5 -r1.5.70.1
+--- binfilter/inc/bf_sfx2/viewfrm.hxx	9 Sep 2005 12:45:26 -0000	1.5
++++ binfilter/inc/bf_sfx2/viewfrm.hxx	28 Apr 2006 08:58:41 -0000	1.5.70.1
+@@ -112,7 +112,7 @@
+ 							SFX_DECL_INTERFACE(SFX_INTERFACE_SFXVIEWFRM);
+ 
+ 							SfxViewFrame() {}
+-							SfxViewFrame( SfxBindings&, SfxFrame*, SfxObjectShell *pDoc=0, ULONG nType = 0 );
++							SfxViewFrame( SfxBindings&, SfxFrame*, SfxObjectShell *pDoc=0, sal_uInt32 nType = 0 );
+ //STRIP001 							SfxViewFrame(SfxObjectShell&, SfxBindings&, SfxFrame*p=0, ULONG nType = 0);
+ //STRIP001 							SfxViewFrame(
+ //STRIP001 								const SfxViewFrame &, SfxBindings &, SfxFrame *pFrame);
+Index: binfilter/inc/bf_starmath/document.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_starmath/document.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.70.1
+diff -u -r1.4 -r1.4.70.1
+--- binfilter/inc/bf_starmath/document.hxx	9 Sep 2005 12:47:58 -0000	1.4
++++ binfilter/inc/bf_starmath/document.hxx	27 Apr 2006 14:01:41 -0000	1.4.70.1
+@@ -83,15 +83,15 @@
+ 
+ #define HINT_DATACHANGED	1004
+ 
+-#define SM30BIDENT	 ((ULONG)0x534D3033L)
+-#define SM30IDENT	 ((ULONG)0x30334d53L)
+-#define SM304AIDENT  ((ULONG)0x34303330L)
+-#define SM30VERSION  ((ULONG)0x00010000L)
+-#define SM50VERSION	 ((ULONG)0x00010001L)	//Unterschied zur SM30VERSION ist
++#define SM30BIDENT	 ((sal_uInt32)0x534D3033L)
++#define SM30IDENT	 ((sal_uInt32)0x30334d53L)
++#define SM304AIDENT  ((sal_uInt32)0x34303330L)
++#define SM30VERSION  ((sal_uInt32)0x00010000L)
++#define SM50VERSION	 ((sal_uInt32)0x00010001L)	//Unterschied zur SM30VERSION ist
+ 											//der neue Border im Format.
+ 
+-#define FRMIDENT	((ULONG)0x03031963L)
+-#define FRMVERSION	((ULONG)0x00010001L)
++#define FRMIDENT	((sal_uInt32)0x03031963L)
++#define FRMVERSION	((sal_uInt32)0x00010001L)
+ 
+ #define STAROFFICE_XML	"StarOffice XML (Math)"
+ #define MATHML_XML		"MathML XML (Math)"
+Index: binfilter/inc/bf_svx/editeng.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/editeng.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.10.2
+diff -u -r1.5 -r1.5.10.2
+--- binfilter/inc/bf_svx/editeng.hxx	7 Apr 2006 13:39:00 -0000	1.5
++++ binfilter/inc/bf_svx/editeng.hxx	27 Apr 2006 12:27:00 -0000	1.5.10.2
+@@ -196,19 +196,19 @@
+ 
+ 	String			GetText( LineEnd eEnd = LINEEND_LF ) const;
+ 	String			GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const;
+-	ULONG			GetTextLen() const;
+-	ULONG			GetTextHeight() const;
+-	ULONG			CalcTextWidth();
++	sal_uInt32		GetTextLen() const;
++	sal_uInt32		GetTextHeight() const;
++	sal_uInt32		CalcTextWidth();
+ 
+ 	String 			GetText( USHORT nParagraph ) const;
+ 	xub_StrLen			GetTextLen( USHORT nParagraph ) const;
+-	ULONG			GetTextHeight( USHORT nParagraph ) const;
++	sal_uInt32		GetTextHeight( USHORT nParagraph ) const;
+ 
+ 	USHORT 			GetParagraphCount() const;
+ 
+ 	USHORT			GetLineCount( USHORT nParagraph ) const;
+ 	xub_StrLen		GetLineLen( USHORT nParagraph, USHORT nLine ) const;
+-	ULONG			GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
++	sal_uInt32		GetLineHeight( USHORT nParagraph, USHORT nLine = 0 );
+ 	USHORT			GetFirstLineOffset( USHORT nParagraph );
+ 	ParagraphInfos 	GetParagraphInfos( USHORT nPara );
+ 	USHORT			FindParagraph( long nDocPosY );
+@@ -306,8 +306,8 @@
+ 	BOOL			IsFlatMode() const;
+ //STRIP001 	void			SetFlatMode( BOOL bFlat );
+ 
+-	void			SetControlWord( ULONG nWord );
+-	ULONG			GetControlWord() const;
++	void			SetControlWord( sal_uInt32 nWord );
++	sal_uInt32		GetControlWord() const;
+ 
+ 	void			QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel );
+ 	void 			QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 );
+@@ -400,7 +400,7 @@
+ 	virtual	void	ParagraphHeightChanged( USHORT nPara );
+ 
+ 	// #101498#
+-	virtual void	DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
++	virtual void	DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
+ 
+ 	virtual String	GetUndoComment( USHORT nUndoId ) const;
+ 	virtual BOOL	FormattingParagraph( USHORT nPara );
+Index: binfilter/inc/bf_svx/flditem.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/flditem.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.10.1
+diff -u -r1.6 -r1.6.10.1
+--- binfilter/inc/bf_svx/flditem.hxx	7 Apr 2006 13:40:04 -0000	1.6
++++ binfilter/inc/bf_svx/flditem.hxx	27 Apr 2006 10:24:44 -0000	1.6.10.1
+@@ -144,7 +144,7 @@
+ 
+ class SvxDateField : public SvxFieldData
+ {
+-	ULONG					nFixDate;
++	sal_uInt32				nFixDate;
+ 	SvxDateType				eType;
+ 	SvxDateFormat			eFormat;
+ 
+@@ -156,7 +156,7 @@
+ 								SvxDateType eType = SVXDATETYPE_VAR,
+ 								SvxDateFormat eFormat = SVXDATEFORMAT_STDSMALL );
+ 
+-	ULONG					GetFixDate() const { return nFixDate; }
++	sal_uInt32				GetFixDate() const { return nFixDate; }
+ 	void					SetFixDate( const Date& rDate ) { nFixDate = rDate.GetDate(); }
+ 
+ 	SvxDateType				GetType() const { return eType; }
+@@ -283,7 +283,7 @@
+ class SvxExtTimeField : public SvxFieldData
+ {
+ private:
+-	ULONG					nFixTime;
++	sal_uInt32				nFixTime;
+ 	SvxTimeType				eType;
+ 	SvxTimeFormat			eFormat;
+ 
+@@ -294,7 +294,7 @@
+ 								SvxTimeType eType = SVXTIMETYPE_VAR,
+ 								SvxTimeFormat eFormat = SVXTIMEFORMAT_STANDARD );
+ 
+-	ULONG					GetFixTime() const { return nFixTime; }
++	sal_uInt32				GetFixTime() const { return nFixTime; }
+ 	void					SetFixTime( const Time& rTime ) { nFixTime = rTime.GetTime(); }
+ 
+ 	SvxTimeType				GetType() const { return eType; }
+Index: binfilter/inc/bf_svx/outliner.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/outliner.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.10.1
+diff -u -r1.5 -r1.5.10.1
+--- binfilter/inc/bf_svx/outliner.hxx	7 Apr 2006 13:40:55 -0000	1.5
++++ binfilter/inc/bf_svx/outliner.hxx	28 Apr 2006 08:58:42 -0000	1.5.10.1
+@@ -416,7 +416,7 @@
+ 
+     const SvxFont&  rFont;
+ 
+-    const long*     pDXArray;
++    const sal_Int32*     pDXArray;
+ 
+ 	// #101498# BiDi level needs to be transported, too.
+ 	BYTE			mnBiDiLevel;
+@@ -425,7 +425,7 @@
+ 	sal_Bool IsRTL() const;
+ 
+     DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen, 
+-		const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const long* pDXArr, BYTE nBiDiLevel) 
++		const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel) 
+         :	rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx), 
+ 			pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel)
+ 	    {
+@@ -795,7 +795,7 @@
+ 
+ 	// #101498#
+ 	virtual void    DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, 
+-						const long* pDXArray, const SvxFont& rFont,
++						const sal_Int32* pDXArray, const SvxFont& rFont,
+ 						USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft);
+ 
+ 	Size            CalcTextSize();
+Index: binfilter/inc/bf_svx/outlobj.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/outlobj.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_svx/outlobj.hxx	9 Sep 2005 14:06:49 -0000	1.3
++++ binfilter/inc/bf_svx/outlobj.hxx	28 Apr 2006 08:58:42 -0000	1.3.72.1
+@@ -67,7 +67,7 @@
+ 
+ 	EditTextObject* 			pText;
+ 	USHORT* 					pDepthArr;
+-	ULONG 						nCount;
++	sal_uInt32					nCount;
+ 	BOOL						bIsEditDoc;
+ 								OutlinerParaObject( USHORT nParaCount );
+ 
+@@ -84,7 +84,7 @@
+ 	BOOL						IsVertical() const;
+ 	void						SetVertical( BOOL bVertical );
+ 
+-	ULONG 						Count() const 					{ return nCount; }
++	sal_uInt32					Count() const 					{ return nCount; }
+ 	USHORT 						GetDepth( USHORT nPara ) const	{ return pDepthArr[nPara]; }
+ 	const EditTextObject& 		GetTextObject() const 			{ return *pText; }
+ 	void						ClearPortionInfo();
+Index: binfilter/inc/bf_svx/svdogrp.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/svdogrp.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/inc/bf_svx/svdogrp.hxx	9 Sep 2005 14:39:54 -0000	1.3
++++ binfilter/inc/bf_svx/svdogrp.hxx	28 Apr 2006 08:58:42 -0000	1.3.70.1
+@@ -78,7 +78,7 @@
+ 	long						nShearWink0; // Letzter bekannter Shearwinkel des Originals
+ 
+ 	ImpSdrObjGroupLink*			pLink;
+-	ULONG						nObjNum;     // des referenzierten Objekts
++	sal_uInt32					nObjNum;     // des referenzierten Objekts
+ 	USHORT						nPageNum;    // zum schnelleren wiederauffinden
+ 	FASTBOOL					bMasterPage; // Liegt im Referenzdokoment auf einer Masterpage
+ 
+Index: binfilter/inc/bf_svx/svxfont.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_svx/svxfont.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.10.1
+diff -u -r1.4 -r1.4.10.1
+--- binfilter/inc/bf_svx/svxfont.hxx	7 Apr 2006 13:41:39 -0000	1.4
++++ binfilter/inc/bf_svx/svxfont.hxx	27 Apr 2006 10:28:10 -0000	1.4.10.1
+@@ -120,10 +120,10 @@
+ //STRIP001 			   const USHORT nIdx = 0, const USHORT nLen = STRING_LEN ) const;
+ 
+ 	void QuickDrawText( OutputDevice *pOut, const Point &rPos, const String &rTxt,
+-			   const USHORT nIdx = 0, const USHORT nLen = STRING_LEN, const long* pDXArray = NULL ) const;
++			   const USHORT nIdx = 0, const USHORT nLen = STRING_LEN, const sal_Int32* pDXArray = NULL ) const;
+ 
+ 	Size QuickGetTextSize( const OutputDevice *pOut, const String &rTxt,
+-						 const USHORT nIdx, const USHORT nLen, long* pDXArray = NULL ) const;
++						 const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray = NULL ) const;
+ 
+ //STRIP001 	void DrawPrev( OutputDevice* pOut, Printer* pPrinter,
+ //STRIP001 				   const Point &rPos, const String &rTxt,
+Index: binfilter/inc/bf_sw/chpfld.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sw/chpfld.hxx,v
+retrieving revision 1.5
+retrieving revision 1.5.72.1
+diff -u -r1.5 -r1.5.72.1
+--- binfilter/inc/bf_sw/chpfld.hxx	9 Sep 2005 15:50:44 -0000	1.5
++++ binfilter/inc/bf_sw/chpfld.hxx	27 Apr 2006 14:44:04 -0000	1.5.72.1
+@@ -80,7 +80,7 @@
+ 	BYTE nLevel;
+ 	String sTitle, sNumber, sPre, sPost;
+ public:
+-	SwChapterField(SwChapterFieldType*, ULONG nFmt = 0);
++	SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
+ 
+ 	void ChangeExpansion( const SwFrm*, const SwTxtNode*, BOOL bSrchNum = FALSE);
+ 
+Index: binfilter/inc/bf_sw/doc.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sw/doc.hxx,v
+retrieving revision 1.6
+retrieving revision 1.6.70.1
+diff -u -r1.6 -r1.6.70.1
+--- binfilter/inc/bf_sw/doc.hxx	9 Sep 2005 15:54:17 -0000	1.6
++++ binfilter/inc/bf_sw/doc.hxx	27 Apr 2006 10:48:48 -0000	1.6.70.1
+@@ -940,7 +940,7 @@
+ 	void UnlockExpFlds()				{ if( nLockExpFld ) --nLockExpFld; }
+ 	sal_Bool IsExpFldsLocked() const		{ return 0 != nLockExpFld; }
+ 	SwDocUpdtFld& GetUpdtFlds() const 	{ return *pUpdtFlds; }
+-	sal_Bool SetFieldsDirty( sal_Bool b, const SwNode* pChk = 0, sal_uInt32 nLen = 0 );
++	sal_Bool SetFieldsDirty( sal_Bool b, const SwNode* pChk = 0, ULONG nLen = 0 );
+ 
+ 	void SetFixFields( sal_Bool bOnlyTimeDate = sal_False,
+ 						const DateTime* pNewDateTime = 0 );
+@@ -1383,7 +1383,7 @@
+ 											const SwTOXBase& rTOX,
+ 											const SfxItemSet* pSet = 0,
+ 											sal_Bool bExpand = sal_False );
+-	const SwTOXBaseSection* InsertTableOf( sal_uInt32 nSttNd, sal_uInt32 nEndNd,
++	const SwTOXBaseSection* InsertTableOf( ULONG nSttNd, ULONG nEndNd,
+ 											const SwTOXBase& rTOX,
+ 											const SfxItemSet* pSet = 0											);
+ 	const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const;
+@@ -1475,7 +1475,7 @@
+ 	// loeschen geht nur, wenn die ::com::sun::star::chaos::Rule niemand benutzt!
+ 	sal_Bool DelNumRule( const String& rName );
+ 	String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
+-	void UpdateNumRule( const String& rName, sal_uInt32 nUpdPos );
++	void UpdateNumRule( const String& rName, ULONG nUpdPos );
+ 	void UpdateNumRule();	// alle invaliden Updaten
+ 	void ChgNumRuleFmts( const SwNumRule& rRule );
+ //STRIP001 	sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule,
+Index: binfilter/inc/bf_sw/docufld.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sw/docufld.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/inc/bf_sw/docufld.hxx	9 Sep 2005 15:55:57 -0000	1.4
++++ binfilter/inc/bf_sw/docufld.hxx	27 Apr 2006 14:44:05 -0000	1.4.72.1
+@@ -158,7 +158,7 @@
+ public:
+ 	SwPageNumberFieldType();
+ 
+-	String& Expand( ULONG nFmt, short nOff, const String&, String& rRet ) const;
++	String& Expand( sal_uInt32 nFmt, short nOff, const String&, String& rRet ) const;
+ 	void ChangeExpansion( SwDoc* pDoc, USHORT nNum, USHORT nMax,
+ 							BOOL bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+ 	inline sal_Int16 GetNumFormat() const { return nNumberingType; }
+@@ -177,7 +177,7 @@
+ 
+ public:
+ 	SwPageNumberField(SwPageNumberFieldType*, USHORT nSub = PG_RANDOM,
+-					  ULONG nFmt = 0, short nOff = 0);
++					  sal_uInt32 nFmt = 0, short nOff = 0);
+ 
+ 	virtual String		Expand() const;
+ 	virtual SwField*	Copy() const;
+@@ -216,7 +216,7 @@
+ 	String	aContent;
+ 
+ public:
+-	SwAuthorField(SwAuthorFieldType*, ULONG nFmt = 0);
++	SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
+ 
+ 	virtual String	 	Expand() const;
+ 	virtual SwField* 	Copy() const;
+@@ -251,7 +251,7 @@
+ 	String aContent;
+ 
+ public:
+-	SwFileNameField(SwFileNameFieldType*, ULONG nFmt = 0);
++	SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
+ 
+ 	virtual String	 	Expand() const;
+ 	virtual SwField* 	Copy() const;
+@@ -284,7 +284,7 @@
+ class SwTemplNameField : public SwField
+ {
+ public:
+-	SwTemplNameField(SwTemplNameFieldType*, ULONG nFmt = 0);
++	SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
+ 
+ 	virtual String	 	Expand() const;
+ 	virtual SwField* 	Copy() const;
+@@ -304,7 +304,7 @@
+ 
+ public:
+ 	SwDocStatFieldType(SwDoc*);
+-	String 					Expand(USHORT nSubType, ULONG nFmt) const;
++	String 					Expand(USHORT nSubType, sal_uInt32 nFmt) const;
+  	virtual SwFieldType*    Copy() const;
+ 
+ 	inline sal_Int16 		GetNumFormat() const 		{ return nNumberingType; }
+@@ -321,7 +321,7 @@
+ 
+ public:
+ 	SwDocStatField( SwDocStatFieldType*,
+-					USHORT nSubType = 0, ULONG nFmt = 0);
++					USHORT nSubType = 0, sal_uInt32 nFmt = 0);
+ 
+ 	void ChangeExpansion( const SwFrm* pFrm );
+ 
+@@ -552,7 +552,7 @@
+ public:
+ 	SwDocInfoFieldType(SwDoc* pDc);
+ 
+-	String					Expand(USHORT nSubType, ULONG nFormat, USHORT nLang) const;
++	String					Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang) const;
+  	virtual SwFieldType*    Copy() const;
+ };
+ 
+@@ -562,7 +562,7 @@
+ 	String  aContent;
+ 
+ public:
+-	SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, ULONG nFmt=0);
++	SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, sal_uInt32 nFmt=0);
+ 
+     virtual void            SetSubType(USHORT);
+ 	virtual USHORT	 		GetSubType() const;
+@@ -590,7 +590,7 @@
+ 	inline const String& 	GetData() const					{ return aData; }
+ 	inline void			 	SetData(const String& rStr)		{ aData = rStr; }
+ 
+-	String					Expand(USHORT nSubType, ULONG nFormat) const;
++	String					Expand(USHORT nSubType, sal_uInt32 nFormat) const;
+ 	virtual SwFieldType*    Copy() const;
+ };
+ 
+@@ -600,7 +600,7 @@
+ 	USHORT 	nType;
+ 
+ public:
+-	SwExtUserField(SwExtUserFieldType*, USHORT nSub, ULONG nFmt=0);
++	SwExtUserField(SwExtUserFieldType*, USHORT nSub, sal_uInt32 nFmt=0);
+ 
+ 	virtual String		Expand() const;
+ 	virtual SwField*	Copy() const;
+@@ -690,7 +690,7 @@
+ {
+ 	String sTxt;
+ public:
+-	SwRefPageGetField( SwRefPageGetFieldType*, ULONG nFmt );
++	SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
+ 
+ 	virtual String		Expand() const;
+     virtual SwField*    Copy() const;
+@@ -726,7 +726,7 @@
+ {
+ 	String sTxt, sHelp;
+ public:
+-	SwJumpEditField( SwJumpEditFieldType*, ULONG nFormat,
++	SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
+ 					const String& sText, const String& sHelp );
+ 
+ 	virtual String		Expand() const;
+Index: binfilter/inc/bf_sw/fldbas.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sw/fldbas.hxx,v
+retrieving revision 1.7
+retrieving revision 1.7.10.1
+diff -u -r1.7 -r1.7.10.1
+--- binfilter/inc/bf_sw/fldbas.hxx	7 Apr 2006 13:42:59 -0000	1.7
++++ binfilter/inc/bf_sw/fldbas.hxx	27 Apr 2006 14:44:05 -0000	1.7.10.1
+@@ -267,11 +267,11 @@
+ 	Beschreibung: Allgemeine Tools
+  --------------------------------------------------------------------*/
+ 
+-String	GetResult(double nVal, ULONG nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
++String	GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
+ void    SetErrorStr(const String& rStr);
+ //String	ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
+ //String 	ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
+-String  FormatNumber(USHORT nNum, ULONG nFormat);
++String  FormatNumber(USHORT nNum, sal_uInt32 nFormat);
+ 
+ /*--------------------------------------------------------------------
+ 	Beschreibung: 	Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor.
+@@ -330,13 +330,13 @@
+ {
+ 	USHORT				nLang;	// Immer ueber SetLanguage aendern!
+     BOOL                bIsAutomaticLanguage;
+-	ULONG 				nFormat;
++	sal_uInt32			nFormat;
+ 
+ 	SwFieldType* 		pType;
+ protected:
+-	void				SetFormat(ULONG nSet) {nFormat = nSet;}
++	void				SetFormat(sal_uInt32 nSet) {nFormat = nSet;}
+ 
+-	SwField(SwFieldType* pTyp, ULONG nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM);
++	SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM);
+ public:
+ 	virtual 			~SwField();
+ 
+@@ -372,13 +372,13 @@
+ 	virtual void		SetLanguage(USHORT nLng);
+ 
+ 	// Parameter fuer Dialog und BASIC erfragen
+-	inline ULONG		GetFormat() const;
++	inline sal_uInt32 GetFormat() const;
+ 	virtual const String& GetPar1() const;
+ 	virtual String		GetPar2() 	const;
+ 
+ 	virtual String		GetFormula() const;
+ 
+-	virtual void  		ChangeFormat(ULONG n);
++	virtual void  		ChangeFormat(sal_uInt32 n);
+     virtual void        SetPar1(const String& rStr);
+     virtual void        SetPar2(const String& rStr);
+ 
+@@ -396,7 +396,7 @@
+ inline SwFieldType*	SwField::GetTyp() const
+ 	{ return pType; 	}
+ 
+-inline ULONG SwField::GetFormat() const
++inline sal_uInt32 SwField::GetFormat() const
+ 	{ return nFormat; 	}
+ 
+ inline USHORT SwField::GetLanguage() const
+@@ -423,7 +423,7 @@
+ 	inline BOOL		UseFormat() const					{ return bUseFormat; }
+ 	inline void		EnableFormat(BOOL bFormat = TRUE)	{ bUseFormat = bFormat; }
+ 
+-	String			ExpandValue(const double& rVal, ULONG nFmt, USHORT nLng=0) const;
++	String			ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const;
+ 	void			DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const;
+ //STRIP001 	void			DoubleToString(String &rValue, const double &rVal, ULONG nFmt) const;
+ };
+@@ -434,7 +434,7 @@
+ //	String sExpand;
+ 
+ protected:
+-	SwValueField( SwValueFieldType* pFldType, ULONG nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
++	SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+ //STRIP001 	SwValueField( const SwValueField& rFld );
+ 
+ public:
+@@ -450,7 +450,7 @@
+ 	virtual double			GetValue() const;
+ 	virtual void 			SetValue( const double& rVal );
+ 
+-	inline String	ExpandValue(const double& rVal, ULONG nFmt, USHORT nLng=0) const
++	inline String	ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const
+ 		{ return ((SwValueFieldType*)GetTyp())->ExpandValue(rVal, nFmt, nLng); }
+ 
+ //STRIP001 	static ULONG			GetSystemFormat(SvNumberFormatter* pFormatter, ULONG nFmt);
+@@ -461,7 +461,7 @@
+ 	String sFormula;
+ 
+ protected:
+-	SwFormulaField( SwValueFieldType* pFldType, ULONG nFmt = 0, const double fVal = 0.0 );
++	SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 );
+ //STRIP001 	SwFormulaField( const SwFormulaField& rFld );
+ 
+ public:
+Index: binfilter/inc/bf_sw/usrfld.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_sw/usrfld.hxx,v
+retrieving revision 1.4
+retrieving revision 1.4.72.1
+diff -u -r1.4 -r1.4.72.1
+--- binfilter/inc/bf_sw/usrfld.hxx	9 Sep 2005 16:49:18 -0000	1.4
++++ binfilter/inc/bf_sw/usrfld.hxx	27 Apr 2006 14:44:05 -0000	1.4.72.1
+@@ -62,10 +62,10 @@
+ 	virtual const String&	GetName() const;
+ 	virtual SwFieldType*	Copy() const;
+ 
+-	String					Expand(ULONG nFmt, USHORT nSubType, USHORT nLng);
++	String					Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng);
+ 
+-	String					GetContent( ULONG nFmt = 0 );
+-		   void				SetContent( const String& rStr, ULONG nFmt = 0 );
++	String					GetContent( sal_uInt32 nFmt = 0 );
++		   void				SetContent( const String& rStr, sal_uInt32 nFmt = 0 );
+ //STRIP001 		   void				CtrlSetContent( const String& rStr );
+ 
+ 	inline BOOL 			IsValid() const;
+@@ -117,7 +117,7 @@
+ 	USHORT  nSubType;
+ 
+ public:
+-	SwUserField(SwUserFieldType*, USHORT nSub = 0, ULONG nFmt = 0);
++	SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0);
+ 
+ 	virtual USHORT	 		GetSubType() const;
+ 	virtual void	 		SetSubType(USHORT nSub);
+Index: binfilter/inc/bf_xmloff/xmlehelp.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_xmloff/xmlehelp.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.72.1
+diff -u -r1.3 -r1.3.72.1
+--- binfilter/inc/bf_xmloff/xmlehelp.hxx	9 Sep 2005 17:38:19 -0000	1.3
++++ binfilter/inc/bf_xmloff/xmlehelp.hxx	28 Apr 2006 08:58:43 -0000	1.3.72.1
+@@ -46,10 +46,10 @@
+ class SvXMLExportHelper
+ {
+ public:
+-	static void AddLength( long nValue, MapUnit eValueUnit,
++	static void AddLength( sal_Int32 nValue, MapUnit eValueUnit,
+ 						   ::rtl::OUStringBuffer& rOut,
+ 						   MapUnit eOutUnit );
+-	static void AddPercentage( long nVal, ::rtl::OUStringBuffer& rOut );
++	static void AddPercentage( sal_Int32 nVal, ::rtl::OUStringBuffer& rOut );
+ 	static double GetConversionFactor(::rtl::OUStringBuffer& rUnit, 
+ 		const MapUnit eCoreUnit, const MapUnit eDestUnit);
+ 	static MapUnit GetUnitFromString(const ::rtl::OUString& rString, 
+Index: binfilter/inc/bf_xmloff/xmluconv.hxx
+===================================================================
+RCS file: /cvs/framework/binfilter/inc/bf_xmloff/xmluconv.hxx,v
+retrieving revision 1.3
+retrieving revision 1.3.70.1
+diff -u -r1.3 -r1.3.70.1
+--- binfilter/inc/bf_xmloff/xmluconv.hxx	9 Sep 2005 17:45:40 -0000	1.3
++++ binfilter/inc/bf_xmloff/xmluconv.hxx	28 Apr 2006 08:58:43 -0000	1.3.70.1
+@@ -165,8 +165,8 @@
+ 	/** convert string to measure using optional min and max values*/
+ 	sal_Bool convertMeasure( sal_Int32& rValue,
+ 						 const ::rtl::OUString& rString,
+-						 sal_Int32 nMin = LONG_MIN,
+-						 sal_Int32 nMax = LONG_MAX ) const;
++						 sal_Int32 nMin = SAL_MIN_INT32,
++						 sal_Int32 nMax = SAL_MAX_INT32 ) const;
+ 
+ 	/** convert measure to string */
+ 	void convertMeasure( ::rtl::OUStringBuffer& rBuffer,
+@@ -182,8 +182,8 @@
+ 	static sal_Bool convertMeasure( sal_Int32& rVal,
+ 								const ::rtl::OUString& rString,
+ 								MapUnit eDstUnit,
+-								sal_Int32 nMin = LONG_MIN,
+-								sal_Int32 nMax = LONG_MAX );
++								sal_Int32 nMin = SAL_MIN_INT32,
++								sal_Int32 nMax = SAL_MAX_INT32 );
+ 
+ 	/** convert measure in given unit to string with given unit */
+ 	static void convertMeasure( ::rtl::OUStringBuffer& rBuffer,
+@@ -261,8 +261,8 @@
+ 	/** convert string to number with optional min and max values */
+ 	static sal_Bool convertNumber( sal_Int32& rValue,
+ 							   const ::rtl::OUString& rString,
+-							   sal_Int32 nMin = LONG_MIN,
+-							   sal_Int32 nMax = LONG_MAX );
++							   sal_Int32 nMin = SAL_MIN_INT32,
++							   sal_Int32 nMax = SAL_MAX_INT32 );
+ 
+ 	/** convert double number to string (using ::rtl::math) and DO
+ 		convert to export MapUnit */
diff --git a/editors/openoffice.org-3-RC/files/patch-i64906 b/editors/openoffice.org-3-RC/files/patch-i64906
new file mode 100644
index 000000000000..fec74c8029ac
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i64906
@@ -0,0 +1,11 @@
+--- sal/osl/unx/security.c~	Wed May 10 20:57:40 2006
++++ sal/osl/unx/security.c	Wed May 10 22:35:43 2006
+@@ -73,7 +73,7 @@
+ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+ 
+ static oslSecurityImpl * newSecurityImpl(size_t * bufSize) {
+-#ifdef MACOSX
++#if defined (MACOSX) || defined (FREEBSD)
+     /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X */
+     size_t n = 1024;
+ #else
diff --git a/editors/openoffice.org-3-RC/files/patch-i65467 b/editors/openoffice.org-3-RC/files/patch-i65467
new file mode 100644
index 000000000000..cbaef34381fe
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65467
@@ -0,0 +1,2718 @@
+--- bridges/prj/build.lst	8 Mar 2006 08:49:22 -0000	1.34
++++ bridges/prj/build.lst	8 May 2006 21:26:08 -0000
+@@ -9,6 +9,7 @@
+ br	bridges\source\cpp_uno\gcc3_linux_intel	nmake	-	u	br_gcc3li br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_freebsd_intel	nmake	-	u	br_gcc3fi br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_x86-64	nmake	-	u	br_gcc3lx br_cppuno_shared br_unotypes NULL
++br	bridges\source\cpp_uno\gcc3_freebsd_x86-64	nmake	-	u	br_gcc3fx br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_powerpc	nmake	-	u	br_gcclp3 br_cppuno_shared br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_s390		nmake	-	u	br_gccl33 br_unotypes NULL
+ br	bridges\source\cpp_uno\gcc3_linux_sparc		nmake	-	u	br_gccl3s br_unotypes br_cppuno_shared NULL
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.cxx	Wed Mar  8 03:49:32 2006
+@@ -0,0 +1,808 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++// This is an implementation of the x86-64 ABI as described in 'System V
++// Application Binary Interface, AMD64 Architecture Processor Supplement'
++// (http://www.x86-64.org/documentation/abi-0.95.pdf)
++//
++// The code in this file is a modification of src/x86/ffi64.c from libffi
++// (http://sources.redhat.com/libffi/) which is under the following license:
++
++/* -----------------------------------------------------------------------
++   ffi.c - Copyright (c) 2002  Bo Thorsen <bo@suse.de>
++   
++   x86-64 Foreign Function Interface 
++
++   Permission is hereby granted, free of charge, to any person obtaining
++   a copy of this software and associated documentation files (the
++   ``Software''), to deal in the Software without restriction, including
++   without limitation the rights to use, copy, modify, merge, publish,
++   distribute, sublicense, and/or sell copies of the Software, and to
++   permit persons to whom the Software is furnished to do so, subject to
++   the following conditions:
++
++   The above copyright notice and this permission notice shall be included
++   in all copies or substantial portions of the Software.
++
++   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
++   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
++   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++   OTHER DEALINGS IN THE SOFTWARE.
++   ----------------------------------------------------------------------- */
++
++#include <abi.hxx>
++
++#include <rtl/ustring.hxx>
++
++using namespace x86_64;
++
++typedef struct
++{
++    /* Registers for argument passing.  */
++    long gpr[MAX_GPR_REGS];
++    __int128_t sse[MAX_SSE_REGS];
++
++    /* Stack space for arguments.  */
++    char argspace[0];
++} stackLayout;
++
++/* Register class used for passing given 64bit part of the argument.
++   These represent classes as documented by the PS ABI, with the exception
++   of SSESF, SSEDF classes, that are basically SSE class, just gcc will
++   use SF or DFmode move instead of DImode to avoid reformating penalties.
++
++   Similary we play games with INTEGERSI_CLASS to use cheaper SImode moves
++   whenever possible (upper half does contain padding).
++ */
++enum x86_64_reg_class
++{
++    X86_64_NO_CLASS,
++    X86_64_INTEGER_CLASS,
++    X86_64_INTEGERSI_CLASS,
++    X86_64_SSE_CLASS,
++    X86_64_SSESF_CLASS,
++    X86_64_SSEDF_CLASS,
++    X86_64_SSEUP_CLASS,
++    X86_64_X87_CLASS,
++    X86_64_X87UP_CLASS,
++    X86_64_MEMORY_CLASS
++};
++
++#define MAX_CLASSES 4
++
++#define ALIGN(v, a) (((((size_t) (v))-1) | ((a)-1))+1)
++
++/* x86-64 register passing implementation.  See x86-64 ABI for details.  Goal
++   of this code is to classify each 8bytes of incoming argument by the register
++   class and assign registers accordingly.  */
++
++/* Return the union class of CLASS1 and CLASS2.
++   See the x86-64 PS ABI for details.  */
++
++static enum x86_64_reg_class
++merge_classes (enum x86_64_reg_class class1, enum x86_64_reg_class class2)
++{
++    /* Rule #1: If both classes are equal, this is the resulting class.  */
++    if (class1 == class2)
++        return class1;
++
++    /* Rule #2: If one of the classes is NO_CLASS, the resulting class is
++       the other class.  */
++    if (class1 == X86_64_NO_CLASS)
++        return class2;
++    if (class2 == X86_64_NO_CLASS)
++        return class1;
++
++    /* Rule #3: If one of the classes is MEMORY, the result is MEMORY.  */
++    if (class1 == X86_64_MEMORY_CLASS || class2 == X86_64_MEMORY_CLASS)
++        return X86_64_MEMORY_CLASS;
++
++    /* Rule #4: If one of the classes is INTEGER, the result is INTEGER.  */
++    if ((class1 == X86_64_INTEGERSI_CLASS && class2 == X86_64_SSESF_CLASS)
++            || (class2 == X86_64_INTEGERSI_CLASS && class1 == X86_64_SSESF_CLASS))
++        return X86_64_INTEGERSI_CLASS;
++    if (class1 == X86_64_INTEGER_CLASS || class1 == X86_64_INTEGERSI_CLASS
++            || class2 == X86_64_INTEGER_CLASS || class2 == X86_64_INTEGERSI_CLASS)
++        return X86_64_INTEGER_CLASS;
++
++    /* Rule #5: If one of the classes is X87 or X87UP class, MEMORY is used.  */
++    if (class1 == X86_64_X87_CLASS || class1 == X86_64_X87UP_CLASS
++            || class2 == X86_64_X87_CLASS || class2 == X86_64_X87UP_CLASS)
++        return X86_64_MEMORY_CLASS;
++
++    /* Rule #6: Otherwise class SSE is used.  */
++    return X86_64_SSE_CLASS;
++}
++
++/* Classify the argument of type TYPE and mode MODE.
++   CLASSES will be filled by the register class used to pass each word
++   of the operand.  The number of words is returned.  In case the parameter
++   should be passed in memory, 0 is returned. As a special case for zero
++   sized containers, classes[0] will be NO_CLASS and 1 is returned.
++
++   See the x86-64 PS ABI for details.
++*/
++static int
++classify_argument( typelib_TypeDescriptionReference *pTypeRef, enum x86_64_reg_class classes[], int &rByteOffset )
++{
++    /* First, align to the right place.  */
++    rByteOffset = ALIGN( rByteOffset, pTypeRef->pType->nAlignment );
++
++    switch ( pTypeRef->eTypeClass )
++    {
++        case typelib_TypeClass_VOID:
++            classes[0] = X86_64_NO_CLASS;
++            return 1;
++        case typelib_TypeClass_CHAR:
++        case typelib_TypeClass_BOOLEAN:
++        case typelib_TypeClass_BYTE:
++        case typelib_TypeClass_SHORT:
++        case typelib_TypeClass_UNSIGNED_SHORT:
++        case typelib_TypeClass_LONG:
++        case typelib_TypeClass_UNSIGNED_LONG:
++        case typelib_TypeClass_HYPER:
++        case typelib_TypeClass_UNSIGNED_HYPER:
++        case typelib_TypeClass_ENUM:
++            if ( ( rByteOffset % 8 + pTypeRef->pType->nSize ) <= 4 )
++                classes[0] = X86_64_INTEGERSI_CLASS;
++            else
++                classes[0] = X86_64_INTEGER_CLASS;
++            return 1;
++        case typelib_TypeClass_FLOAT:
++            if ( ( rByteOffset % 8 ) == 0 )
++                classes[0] = X86_64_SSESF_CLASS;
++            else
++                classes[0] = X86_64_SSE_CLASS;
++            return 1;
++        case typelib_TypeClass_DOUBLE:
++            classes[0] = X86_64_SSEDF_CLASS;
++            return 1;
++        /*case LONGDOUBLE:
++            classes[0] = X86_64_X87_CLASS;
++            classes[1] = X86_64_X87UP_CLASS;
++            return 2;*/
++        case typelib_TypeClass_STRING:
++        case typelib_TypeClass_TYPE:
++        case typelib_TypeClass_ANY:
++        case typelib_TypeClass_TYPEDEF:
++        case typelib_TypeClass_UNION:
++        case typelib_TypeClass_SEQUENCE:
++        case typelib_TypeClass_ARRAY:
++        case typelib_TypeClass_INTERFACE:
++            return 0;
++        case typelib_TypeClass_STRUCT:
++        case typelib_TypeClass_EXCEPTION:
++            {
++                typelib_TypeDescription * pTypeDescr = 0;
++                TYPELIB_DANGER_GET( &pTypeDescr, pTypeRef );
++
++                const int UNITS_PER_WORD = 8;
++                int words = ( pTypeDescr->nSize + UNITS_PER_WORD - 1 ) / UNITS_PER_WORD;
++                enum x86_64_reg_class subclasses[MAX_CLASSES];
++
++                /* If the struct is larger than 16 bytes, pass it on the stack.  */
++                if ( pTypeDescr->nSize > 16 )
++                {
++                    TYPELIB_DANGER_RELEASE( pTypeDescr );
++                    return 0;
++                }
++
++                for ( int i = 0; i < words; i++ )
++                    classes[i] = X86_64_NO_CLASS;
++
++                const typelib_CompoundTypeDescription *pStruct = reinterpret_cast<const typelib_CompoundTypeDescription*>( pTypeDescr );
++
++                /* Merge the fields of structure.  */
++                for ( sal_Int32 nMember = 0; nMember < pStruct->nMembers; ++nMember )
++                {
++                    typelib_TypeDescriptionReference *pTypeInStruct = pStruct->ppTypeRefs[ nMember ];
++
++                    int num = classify_argument( pTypeInStruct, subclasses, rByteOffset );
++
++                    if ( num == 0 )
++                    {
++                        TYPELIB_DANGER_RELEASE( pTypeDescr );
++                        return 0;
++                    }
++
++                    for ( int i = 0; i < num; i++ )
++                    {
++                        int pos = rByteOffset / 8;
++                        classes[i + pos] = merge_classes( subclasses[i], classes[i + pos] );
++                    }
++
++                    if ( pTypeInStruct->eTypeClass != typelib_TypeClass_STRUCT )
++                        rByteOffset = pStruct->pMemberOffsets[ nMember ];
++                }
++
++                TYPELIB_DANGER_RELEASE( pTypeDescr );
++
++                /* Final merger cleanup.  */
++                for ( int i = 0; i < words; i++ )
++                {
++                    /* If one class is MEMORY, everything should be passed in
++                       memory.  */
++                    if ( classes[i] == X86_64_MEMORY_CLASS )
++                        return 0;
++
++                    /* The X86_64_SSEUP_CLASS should be always preceded by
++                       X86_64_SSE_CLASS.  */
++                    if ( classes[i] == X86_64_SSEUP_CLASS
++                            && ( i == 0 || classes[i - 1] != X86_64_SSE_CLASS ) )
++                        classes[i] = X86_64_SSE_CLASS;
++
++                    /*  X86_64_X87UP_CLASS should be preceded by X86_64_X87_CLASS.  */
++                    if ( classes[i] == X86_64_X87UP_CLASS
++                            && ( i == 0 || classes[i - 1] != X86_64_X87_CLASS ) )
++                        classes[i] = X86_64_SSE_CLASS;
++                }
++                return words;
++            }
++
++        default:
++#if OSL_DEBUG_LEVEL > 1
++            OSL_TRACE( "Unhandled case: pType->eTypeClass == %d\n", pTypeRef->eTypeClass );
++#endif
++            OSL_ASSERT(0);
++    }
++    return 0; /* Never reached.  */
++}
++
++/* Examine the argument and return set number of register required in each
++   class.  Return 0 iff parameter should be passed in memory.  */
++bool x86_64::examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE )
++{
++    enum x86_64_reg_class classes[MAX_CLASSES];
++    int offset = 0;
++    int n;
++
++    n = classify_argument( pTypeRef, classes, offset );
++
++    if ( n == 0 )
++        return false;
++
++    nUsedGPR = 0;
++    nUsedSSE = 0;
++    for ( n--; n >= 0; n-- )
++        switch ( classes[n] )
++        {
++            case X86_64_INTEGER_CLASS:
++            case X86_64_INTEGERSI_CLASS:
++                nUsedGPR++;
++                break;
++            case X86_64_SSE_CLASS:
++            case X86_64_SSESF_CLASS:
++            case X86_64_SSEDF_CLASS:
++                nUsedSSE++;
++                break;
++            case X86_64_NO_CLASS:
++            case X86_64_SSEUP_CLASS:
++                break;
++            case X86_64_X87_CLASS:
++            case X86_64_X87UP_CLASS:
++                if ( !bInReturn )
++                    return false;
++                break;
++            default:
++#if OSL_DEBUG_LEVEL > 1
++            OSL_TRACE( "Unhandled case: classes[n] == %d\n", classes[n] );
++#endif
++            OSL_ASSERT(0);
++        }
++    return true;
++}
++
++bool x86_64::return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef )
++{
++    int g, s;
++
++    return examine_argument( pTypeRef, true, g, s ) == 0;
++}
++
++void x86_64::fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct )
++{
++    enum x86_64_reg_class classes[MAX_CLASSES];
++    int offset = 0;
++    int n;
++
++    n = classify_argument( pTypeRef, classes, offset );
++
++    sal_uInt64 *pStructAlign = reinterpret_cast<sal_uInt64 *>( pStruct );
++    for ( n--; n >= 0; n-- )
++        switch ( classes[n] )
++        {
++            case X86_64_INTEGER_CLASS:
++            case X86_64_INTEGERSI_CLASS:
++                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pGPR++ );
++                break;
++            case X86_64_SSE_CLASS:
++            case X86_64_SSESF_CLASS:
++            case X86_64_SSEDF_CLASS:
++                *pStructAlign++ = *reinterpret_cast<sal_uInt64 *>( *pSSE++ );
++                break;
++        }
++}
++
++#if 0
++
++/* Functions to load floats and double to an SSE register placeholder.  */
++extern void float2sse (float, __int128_t *);
++extern void double2sse (double, __int128_t *);
++extern void floatfloat2sse (void *, __int128_t *);
++
++/* Functions to put the floats and doubles back.  */
++extern float sse2float (__int128_t *);
++extern double sse2double (__int128_t *);
++extern void sse2floatfloat(__int128_t *, void *);
++
++/*@-exportheader@*/
++void
++ffi_prep_args (stackLayout *stack, extended_cif *ecif)
++/*@=exportheader@*/
++{
++  int gprcount, ssecount, i, g, s;
++  void **p_argv;
++  void *argp = &stack->argspace;
++  ffi_type **p_arg;
++
++  /* First check if the return value should be passed in memory. If so,
++     pass the pointer as the first argument.  */
++  gprcount = ssecount = 0;
++  if (ecif->cif->rtype->type != FFI_TYPE_VOID 
++      && examine_argument (ecif->cif->rtype, 1, &g, &s) == 0)
++    (void *)stack->gpr[gprcount++] = ecif->rvalue;
++
++  for (i=ecif->cif->nargs, p_arg=ecif->cif->arg_types, p_argv = ecif->avalue;
++       i!=0; i--, p_arg++, p_argv++)
++    {
++      int in_register = 0;
++
++      switch ((*p_arg)->type)
++	{
++	case FFI_TYPE_SINT8:
++	case FFI_TYPE_SINT16:
++	case FFI_TYPE_SINT32:
++	case FFI_TYPE_SINT64:
++	case FFI_TYPE_UINT8:
++	case FFI_TYPE_UINT16:
++	case FFI_TYPE_UINT32:
++	case FFI_TYPE_UINT64:
++	case FFI_TYPE_POINTER:
++	  if (gprcount < MAX_GPR_REGS)
++	    {
++	      stack->gpr[gprcount] = 0;
++	      stack->gpr[gprcount++] = *(long long *)(*p_argv);
++	      in_register = 1;
++	    }
++	  break;
++
++	case FFI_TYPE_FLOAT:
++	  if (ssecount < MAX_SSE_REGS)
++	    {
++	      float2sse (*(float *)(*p_argv), &stack->sse[ssecount++]);
++	      in_register = 1;
++	    }
++	  break;
++
++	case FFI_TYPE_DOUBLE:
++	  if (ssecount < MAX_SSE_REGS)
++	    {
++	      double2sse (*(double *)(*p_argv), &stack->sse[ssecount++]);
++	      in_register = 1;
++	    }
++	  break;
++	}
++
++      if (in_register)
++	continue;
++
++      /* Either all places in registers where filled, or this is a
++	 type that potentially goes into a memory slot.  */
++      if (examine_argument (*p_arg, 0, &g, &s) == 0
++	  || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
++	{
++	  /* Pass this argument in memory.  */
++	  argp = (void *)ALIGN(argp, (*p_arg)->alignment);
++	  memcpy (argp, *p_argv, (*p_arg)->size);
++	  argp += (*p_arg)->size;
++	}
++      else
++	{
++	  /* All easy cases are eliminated. Now fire the big guns.  */
++
++	  enum x86_64_reg_class classes[MAX_CLASSES];
++	  int offset = 0, j, num;
++	  void *a;
++
++	  num = classify_argument (*p_arg, classes, &offset);
++	  for (j=0, a=*p_argv; j<num; j++, a+=8)
++	    {
++	      switch (classes[j])
++		{
++		case X86_64_INTEGER_CLASS:
++		case X86_64_INTEGERSI_CLASS:
++		  stack->gpr[gprcount++] = *(long long *)a;
++		  break;
++		case X86_64_SSE_CLASS:
++		  floatfloat2sse (a, &stack->sse[ssecount++]);
++		  break;
++		case X86_64_SSESF_CLASS:
++		  float2sse (*(float *)a, &stack->sse[ssecount++]);
++		  break;
++		case X86_64_SSEDF_CLASS:
++		  double2sse (*(double *)a, &stack->sse[ssecount++]);
++		  break;
++		default:
++		  abort();
++		}
++	    }
++	}
++    }
++}
++
++/* Perform machine dependent cif processing.  */
++ffi_status
++ffi_prep_cif_machdep (ffi_cif *cif)
++{
++  int gprcount, ssecount, i, g, s;
++
++  gprcount = ssecount = 0;
++
++  /* Reset the byte count. We handle this size estimation here.  */
++  cif->bytes = 0;
++
++  /* If the return value should be passed in memory, pass the pointer
++     as the first argument. The actual memory isn't allocated here.  */
++  if (cif->rtype->type != FFI_TYPE_VOID 
++      && examine_argument (cif->rtype, 1, &g, &s) == 0)
++    gprcount = 1;
++
++  /* Go over all arguments and determine the way they should be passed.
++     If it's in a register and there is space for it, let that be so. If
++     not, add it's size to the stack byte count.  */
++  for (i=0; i<cif->nargs; i++)
++    {
++      if (examine_argument (cif->arg_types[i], 0, &g, &s) == 0
++	  || gprcount + g > MAX_GPR_REGS || ssecount + s > MAX_SSE_REGS)
++	{
++	  /* This is passed in memory. First align to the basic type.  */
++	  cif->bytes = ALIGN(cif->bytes, cif->arg_types[i]->alignment);
++
++	  /* Stack arguments are *always* at least 8 byte aligned.  */
++	  cif->bytes = ALIGN(cif->bytes, 8);
++
++	  /* Now add the size of this argument.  */
++	  cif->bytes += cif->arg_types[i]->size;
++	}
++      else
++	{
++	  gprcount += g;
++	  ssecount += s;
++	}
++    }
++
++  /* Set the flag for the closures return.  */
++    switch (cif->rtype->type)
++    {
++    case FFI_TYPE_VOID:
++    case FFI_TYPE_STRUCT:
++    case FFI_TYPE_SINT64:
++    case FFI_TYPE_FLOAT:
++    case FFI_TYPE_DOUBLE:
++    case FFI_TYPE_LONGDOUBLE:
++      cif->flags = (unsigned) cif->rtype->type;
++      break;
++
++    case FFI_TYPE_UINT64:
++      cif->flags = FFI_TYPE_SINT64;
++      break;
++
++    default:
++      cif->flags = FFI_TYPE_INT;
++      break;
++    }
++
++  return FFI_OK;
++}
++
++typedef struct
++{
++  long gpr[2];
++  __int128_t sse[2];
++  long double st0;
++} return_value;
++
++//#endif
++
++void
++ffi_fill_return_value (return_value *rv, extended_cif *ecif)
++{
++    enum x86_64_reg_class classes[MAX_CLASSES];
++    int i = 0, num;
++    long *gpr = rv->gpr;
++    __int128_t *sse = rv->sse;
++    signed char sc;
++    signed short ss;
++
++    /* This is needed because of the way x86-64 handles signed short
++       integers.  */
++    switch (ecif->cif->rtype->type)
++    {
++        case FFI_TYPE_SINT8:
++            sc = *(signed char *)gpr;
++            *(long long *)ecif->rvalue = (long long)sc;
++            return;
++        case FFI_TYPE_SINT16:
++            ss = *(signed short *)gpr;
++            *(long long *)ecif->rvalue = (long long)ss;
++            return;
++        default:
++            /* Just continue.  */
++            ;
++    }
++
++    num = classify_argument (ecif->cif->rtype, classes, &i);
++
++    if (num == 0)
++        /* Return in memory.  */
++        ecif->rvalue = (void *) rv->gpr[0];
++    else if (num == 2 && classes[0] == X86_64_X87_CLASS &&
++            classes[1] == X86_64_X87UP_CLASS)
++        /* This is a long double (this is easiest to handle this way instead
++           of an eightbyte at a time as in the loop below.  */
++        *((long double *)ecif->rvalue) = rv->st0;
++    else
++    {
++        void *a;
++
++        for (i=0, a=ecif->rvalue; i<num; i++, a+=8)
++        {
++            switch (classes[i])
++            {
++                case X86_64_INTEGER_CLASS:
++                case X86_64_INTEGERSI_CLASS:
++                    *(long long *)a = *gpr;
++                    gpr++;
++                    break;
++                case X86_64_SSE_CLASS:
++                    sse2floatfloat (sse++, a);
++                    break;
++                case X86_64_SSESF_CLASS:
++                    *(float *)a = sse2float (sse++);
++                    break;
++                case X86_64_SSEDF_CLASS:
++                    *(double *)a = sse2double (sse++);
++                    break;
++                default:
++                    abort();
++            }
++        }
++    }
++}
++
++//#if 0
++
++/*@-declundef@*/
++/*@-exportheader@*/
++extern void ffi_call_UNIX64(void (*)(stackLayout *, extended_cif *),
++			    void (*) (return_value *, extended_cif *),
++			    /*@out@*/ extended_cif *, 
++			    unsigned, /*@out@*/ unsigned *, void (*fn)());
++/*@=declundef@*/
++/*@=exportheader@*/
++
++void ffi_call(/*@dependent@*/ ffi_cif *cif, 
++	      void (*fn)(), 
++	      /*@out@*/ void *rvalue, 
++	      /*@dependent@*/ void **avalue)
++{
++  extended_cif ecif;
++  int dummy;
++
++  ecif.cif = cif;
++  ecif.avalue = avalue;
++  
++  /* If the return value is a struct and we don't have a return	*/
++  /* value address then we need to make one		        */
++
++  if ((rvalue == NULL) && 
++      (examine_argument (cif->rtype, 1, &dummy, &dummy) == 0))
++    {
++      /*@-sysunrecog@*/
++      ecif.rvalue = alloca(cif->rtype->size);
++      /*@=sysunrecog@*/
++    }
++  else
++    ecif.rvalue = rvalue;
++    
++  /* Stack must always be 16byte aligned. Make it so.  */
++  cif->bytes = ALIGN(cif->bytes, 16);
++  
++  switch (cif->abi) 
++    {
++    case FFI_SYSV:
++      /* Calling 32bit code from 64bit is not possible  */
++      FFI_ASSERT(0);
++      break;
++
++    case FFI_UNIX64:
++      /*@-usedef@*/
++      ffi_call_UNIX64 (ffi_prep_args, ffi_fill_return_value, &ecif,
++		       cif->bytes, ecif.rvalue, fn);
++      /*@=usedef@*/
++      break;
++
++    default:
++      FFI_ASSERT(0);
++      break;
++    }
++}
++
++extern void ffi_closure_UNIX64(void);
++
++ffi_status
++ffi_prep_closure (ffi_closure* closure,
++		  ffi_cif* cif,
++		  void (*fun)(ffi_cif*, void*, void**, void*),
++		  void *user_data)
++{
++  volatile unsigned short *tramp;
++
++  /* FFI_ASSERT (cif->abi == FFI_OSF);  */
++
++  tramp = (volatile unsigned short *) &closure->tramp[0];
++  tramp[0] = 0xbb49;		/* mov <code>, %r11	*/
++  tramp[5] = 0xba49;		/* mov <data>, %r10	*/
++  tramp[10] = 0xff49;		/* jmp *%r11	*/
++  tramp[11] = 0x00e3;
++  *(void * volatile *) &tramp[1] = ffi_closure_UNIX64;
++  *(void * volatile *) &tramp[6] = closure;
++
++  closure->cif = cif;
++  closure->fun = fun;
++  closure->user_data = user_data;
++
++  return FFI_OK;
++}
++
++int
++ffi_closure_UNIX64_inner(ffi_closure *closure, va_list l, void *rp)
++{
++  ffi_cif *cif;
++  void **avalue;
++  ffi_type **arg_types;
++  long i, avn, argn;
++
++  cif = closure->cif;
++  avalue = alloca(cif->nargs * sizeof(void *));
++
++  argn = 0;
++
++  i = 0;
++  avn = cif->nargs;
++  arg_types = cif->arg_types;
++  
++  /* Grab the addresses of the arguments from the stack frame.  */
++  while (i < avn)
++    {
++      switch (arg_types[i]->type)
++	{
++	case FFI_TYPE_SINT8:
++	case FFI_TYPE_UINT8:
++	case FFI_TYPE_SINT16:
++	case FFI_TYPE_UINT16:
++	case FFI_TYPE_SINT32:
++	case FFI_TYPE_UINT32:
++	case FFI_TYPE_SINT64:
++	case FFI_TYPE_UINT64:
++	case FFI_TYPE_POINTER:
++	  {
++	    if (l->gp_offset > 48-8)
++	      {
++		avalue[i] = l->overflow_arg_area;
++		l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
++	      }
++	    else
++	      {
++		avalue[i] = (char *)l->reg_save_area + l->gp_offset;
++		l->gp_offset += 8;
++	      }
++	  }
++	  break;
++
++	case FFI_TYPE_STRUCT:
++	  /* FIXME  */
++	  FFI_ASSERT(0);
++	  break;
++
++	case FFI_TYPE_DOUBLE:
++	  {
++	    if (l->fp_offset > 176-16)
++	      {
++		avalue[i] = l->overflow_arg_area;
++		l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
++	      }
++	    else
++	      {
++		avalue[i] = (char *)l->reg_save_area + l->fp_offset;
++		l->fp_offset += 16;
++	      }
++	  }
++#if DEBUG_FFI
++	  fprintf (stderr, "double arg %d = %g\n", i, *(double *)avalue[i]);
++#endif
++	  break;
++	  
++	case FFI_TYPE_FLOAT:
++	  {
++	    if (l->fp_offset > 176-16)
++	      {
++		avalue[i] = l->overflow_arg_area;
++		l->overflow_arg_area = (char *)l->overflow_arg_area + 8;
++	      }
++	    else
++	      {
++		avalue[i] = (char *)l->reg_save_area + l->fp_offset;
++		l->fp_offset += 16;
++	      }
++	  }
++#if DEBUG_FFI
++	  fprintf (stderr, "float arg %d = %g\n", i, *(float *)avalue[i]);
++#endif
++	  break;
++	  
++	default:
++	  FFI_ASSERT(0);
++	}
++
++      argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG;
++      i++;
++    }
++
++  /* Invoke the closure.  */
++  (closure->fun) (cif, rp, avalue, closure->user_data);
++
++  /* FIXME: Structs not supported.  */
++  FFI_ASSERT(cif->rtype->type != FFI_TYPE_STRUCT);
++
++  /* Tell ffi_closure_UNIX64 how to perform return type promotions.  */
++
++  return cif->rtype->type;
++}
++
++#endif
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/abi.hxx	Wed Mar  8 03:49:42 2006
+@@ -0,0 +1,75 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#ifndef _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
++#define _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
++
++// This is an implementation of the x86-64 ABI as described in 'System V
++// Application Binary Interface, AMD64 Architecture Processor Supplement'
++// (http://www.x86-64.org/documentation/abi-0.95.pdf)
++
++#include <typelib/typedescription.hxx>
++
++namespace x86_64
++{
++
++/* 6 general purpose registers are used for parameter passing */
++const sal_uInt32 MAX_GPR_REGS = 6;
++
++/* 8 SSE registers are used for parameter passing */
++const sal_uInt32 MAX_SSE_REGS = 8;
++
++/* Count number of required registers.
++
++ Examine the argument and return set number of register required in each
++ class.
++ 
++ Return false iff parameter should be passed in memory.
++*/
++bool examine_argument( typelib_TypeDescriptionReference *pTypeRef, bool bInReturn, int &nUsedGPR, int &nUsedSSE );
++
++/** Does function that returns this type use a hidden parameter, or registers?
++
++ The value can be returned either in a hidden 1st parameter (which is a
++ pointer to a structure allocated by the caller), or in registers (rax, rdx
++ for the integers, xmm0, xmm1 for the floating point numbers).
++*/
++bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
++
++void fill_struct( typelib_TypeDescriptionReference *pTypeRef, void * const *pGPR, void * const *pSSE, void *pStruct );
++
++} // namespace x86_64
++
++#endif // _BRIDGES_CPP_UNO_X86_64_ABI_HXX_
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/call.s	Mon May 15 13:21:10 2006
+@@ -0,0 +1,93 @@
++	.text
++	.align 2
++.globl privateSnippetExecutor
++	.type	privateSnippetExecutor, @function
++privateSnippetExecutor:
++.LFB3:
++	pushq	%rbp
++.LCFI0:
++	movq	%rsp, %rbp
++.LCFI1:
++	subq	$160, %rsp
++.LCFI2:
++	movq	%r10, -152(%rbp)		# Save (nVtableOffset << 32) + nFunctionIndex
++
++	movq	%rdi, -112(%rbp)		# Save GP registers
++	movq	%rsi, -104(%rbp)
++	movq	%rdx, -96(%rbp)
++	movq	%rcx, -88(%rbp)
++	movq	%r8 , -80(%rbp)
++	movq	%r9 , -72(%rbp)
++	
++	movsd	%xmm0, -64(%rbp)		# Save FP registers
++	movsd	%xmm1, -56(%rbp)
++	movsd	%xmm2, -48(%rbp)
++	movsd	%xmm3, -40(%rbp)
++	movsd	%xmm4, -32(%rbp)
++	movsd	%xmm5, -24(%rbp)
++	movsd	%xmm6, -16(%rbp)
++	movsd	%xmm7, -8(%rbp)
++
++	leaq	-144(%rbp), %r9			# 6th param: sal_uInt64 * pRegisterReturn
++	leaq	16(%rbp), %r8			# 5rd param: void ** ovrflw
++	leaq	-64(%rbp), %rcx			# 4th param: void ** fpreg
++	leaq	-112(%rbp), %rdx		# 3rd param: void ** gpreg
++	movl	-148(%rbp), %esi		# 2nd param: sal_int32 nVtableOffset
++	movl	-152(%rbp), %edi		# 1st param: sal_int32 nFunctionIndex
++	
++	call	cpp_vtable_call
++
++	cmp	$10, %rax					# typelib_TypeClass_FLOAT
++	je	.Lfloat
++	cmp	$11, %rax					# typelib_TypeClass_DOUBLE
++	je	.Lfloat
++
++	movq	-144(%rbp), %rax		# Return value (int case)
++	jmp	.Lfinish
++.Lfloat:
++	movlpd	-144(%rbp), %xmm0		# Return value (float/double case)
++
++.Lfinish:
++	leave
++	ret
++.LFE3:
++	.size	privateSnippetExecutor, .-privateSnippetExecutor
++	.section	.eh_frame,"a",@progbits
++.Lframe1:
++	.long	.LECIE1-.LSCIE1
++.LSCIE1:
++	.long	0x0
++	.byte	0x1
++	.string	"zR"
++	.uleb128 0x1
++	.sleb128 -8
++	.byte	0x10
++	.uleb128 0x1
++	.byte	0x1b
++	.byte	0xc
++	.uleb128 0x7
++	.uleb128 0x8
++	.byte	0x90
++	.uleb128 0x1
++	.align 8
++.LECIE1:
++.LSFDE1:
++	.long	.LEFDE1-.LASFDE1
++.LASFDE1:
++	.long	.LASFDE1-.Lframe1
++	.long	.LFB3-.
++	.long	.LFE3-.LFB3
++	.uleb128 0x0
++	.byte	0x4
++	.long	.LCFI0-.LFB3
++	.byte	0xe
++	.uleb128 0x10
++	.byte	0x86
++	.uleb128 0x2
++	.byte	0x4
++	.long	.LCFI1-.LCFI0
++	.byte	0xd
++	.uleb128 0x6
++	.align 8
++.LEFDE1:
++	.section	.note.GNU-stack,"",@progbits
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx	Tue May  9 12:49:06 2006
+@@ -0,0 +1,539 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <hash_map>
++
++#include <rtl/alloc.h>
++#include <osl/mutex.hxx>
++
++#include <com/sun/star/uno/genfunc.hxx>
++#include "com/sun/star/uno/RuntimeException.hpp"
++#include <uno/data.h>
++#include <typelib/typedescription.hxx>
++
++#include "bridges/cpp_uno/shared/bridge.hxx"
++#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
++#include "bridges/cpp_uno/shared/types.hxx"
++#include "bridges/cpp_uno/shared/vtablefactory.hxx"
++
++#include "abi.hxx"
++#include "share.hxx"
++
++using namespace ::osl;
++using namespace ::rtl;
++using namespace ::com::sun::star::uno;
++
++//==================================================================================================
++
++// Perform the UNO call
++//
++// We must convert the paramaters stored in gpreg, fpreg and ovrflw to UNO
++// arguments and call pThis->getUnoI()->pDispatcher.
++//
++// gpreg:  [ret *], this, [gpr params]
++// fpreg:  [fpr params]
++// ovrflw: [gpr or fpr params (properly aligned)]
++//
++// [ret *] is present when we are returning a structure bigger than 16 bytes
++// Simple types are returned in rax, rdx (int), or xmm0, xmm1 (fp).
++// Similarly structures <= 16 bytes are in rax, rdx, xmm0, xmm1 as necessary.
++static typelib_TypeClass cpp2uno_call(
++	bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
++	const typelib_TypeDescription * pMemberTypeDescr,
++	typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void return
++	sal_Int32 nParams, typelib_MethodParameter * pParams,
++	void ** gpreg, void ** fpreg, void ** ovrflw,
++	sal_uInt64 * pRegisterReturn /* space for register return */ )
++{
++	int nr_gpr = 0; //number of gpr registers used 
++	int nr_fpr = 0; //number of fpr regsiters used
++       
++	// return
++	typelib_TypeDescription * pReturnTypeDescr = 0;
++	if (pReturnTypeRef)
++		TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
++	
++	void * pUnoReturn = 0;
++	void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn, reconversion need
++	
++	if ( pReturnTypeDescr )
++	{
++		if ( x86_64::return_in_hidden_param( pReturnTypeRef ) )
++		{
++			pCppReturn = *gpreg++;
++			nr_gpr++;
++			
++			pUnoReturn = ( bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
++						   ? alloca( pReturnTypeDescr->nSize )
++						   : pCppReturn ); // direct way
++		}
++		else
++			pUnoReturn = pRegisterReturn; // direct way for simple types
++	}
++
++	// pop this
++	gpreg++; 
++	nr_gpr++;
++
++	// stack space
++	// parameters
++	void ** pUnoArgs = (void **)alloca( 4 * sizeof(void *) * nParams );
++	void ** pCppArgs = pUnoArgs + nParams;
++	// indizes of values this have to be converted (interface conversion cpp<=>uno)
++	sal_Int32 * pTempIndizes = (sal_Int32 *)(pUnoArgs + (2 * nParams));
++	// type descriptions for reconversions
++	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pUnoArgs + (3 * nParams));
++	
++	sal_Int32 nTempIndizes = 0;
++
++	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
++	{
++		const typelib_MethodParameter & rParam = pParams[nPos];
++		typelib_TypeDescription * pParamTypeDescr = 0;
++		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
++
++		int nUsedGPR = 0;
++		int nUsedSSE = 0;
++		bool bFitsRegisters = x86_64::examine_argument( rParam.pTypeRef, false, nUsedGPR, nUsedSSE );
++		if ( !rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ) ) // value
++		{
++			// Simple types must fit exactly one register on x86_64
++			OSL_ASSERT( bFitsRegisters && ( ( nUsedSSE == 1 && nUsedGPR == 0 ) || ( nUsedSSE == 0 && nUsedGPR == 1 ) ) );
++
++			if ( nUsedSSE == 1 )
++			{
++				if ( nr_fpr < x86_64::MAX_SSE_REGS )
++				{
++					pCppArgs[nPos] = pUnoArgs[nPos] = fpreg++;
++					nr_fpr++;
++				}
++				else
++					pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
++			}
++			else if ( nUsedGPR == 1 )
++			{
++				if ( nr_gpr < x86_64::MAX_GPR_REGS )
++				{
++					pCppArgs[nPos] = pUnoArgs[nPos] = gpreg++;
++					nr_gpr++;
++				}
++				else
++					pCppArgs[nPos] = pUnoArgs[nPos] = ovrflw++;
++			}
++
++			// no longer needed
++			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++		}
++		else // struct <= 16 bytes || ptr to complex value || ref
++		{
++			void *pCppStack;
++			char pTmpStruct[16];
++
++			if ( bFitsRegisters && !rParam.bOut &&
++				 ( pParamTypeDescr->eTypeClass == typelib_TypeClass_STRUCT ||
++				   pParamTypeDescr->eTypeClass == typelib_TypeClass_EXCEPTION ) )
++			{
++				if ( ( nr_gpr + nUsedGPR <= x86_64::MAX_GPR_REGS ) && ( nr_fpr + nUsedSSE <= x86_64::MAX_SSE_REGS ) )
++				{
++					x86_64::fill_struct( rParam.pTypeRef, gpreg, fpreg, pTmpStruct );
++#if OSL_DEBUG_LEVEL > 1
++					fprintf( stderr, "nUsedGPR == %d, nUsedSSE == %d, pTmpStruct[0] == 0x%x, pTmpStruct[1] == 0x%x, **gpreg == 0x%lx\n",
++							nUsedGPR, nUsedSSE, pTmpStruct[0], pTmpStruct[1], *(sal_uInt64*)*gpreg );
++#endif
++
++					pCppArgs[nPos] = pCppStack = reinterpret_cast<void *>( pTmpStruct );
++					gpreg += nUsedGPR;
++					fpreg += nUsedSSE;
++				}
++				else
++					pCppArgs[nPos] = pCppStack = *ovrflw++;
++			}
++			else if ( nr_gpr < x86_64::MAX_GPR_REGS )
++			{ 
++				pCppArgs[nPos] = pCppStack = *gpreg++;
++				nr_gpr++;
++			}
++			else
++				pCppArgs[nPos] = pCppStack = *ovrflw++;
++
++			if (! rParam.bIn) // is pure out
++			{
++				// uno out is unconstructed mem!
++				pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize );
++				pTempIndizes[nTempIndizes] = nPos;
++				// will be released at reconversion
++				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
++			}
++			else if ( bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ) ) // is in/inout
++			{
++				uno_copyAndConvertData( pUnoArgs[nPos] = alloca( pParamTypeDescr->nSize ),
++										pCppStack, pParamTypeDescr,
++										pThis->getBridge()->getCpp2Uno() );
++				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
++				// will be released at reconversion
++				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
++			}
++			else // direct way
++			{
++				pUnoArgs[nPos] = pCppStack;
++				// no longer needed
++				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++			}
++		}
++	}
++	
++	// ExceptionHolder
++	uno_Any aUnoExc; // Any will be constructed by callee
++	uno_Any * pUnoExc = &aUnoExc;
++
++	// invoke uno dispatch call
++	(*pThis->getUnoI()->pDispatcher)( pThis->getUnoI(), pMemberTypeDescr, pUnoReturn, pUnoArgs, &pUnoExc );
++	
++	// in case an exception occured...
++	if ( pUnoExc )
++	{
++		// destruct temporary in/inout params
++		for ( ; nTempIndizes--; )
++		{
++			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
++			
++			if (pParams[nIndex].bIn) // is in/inout => was constructed
++				uno_destructData( pUnoArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], 0 );
++			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
++		}
++		if (pReturnTypeDescr)
++			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
++		
++		CPPU_CURRENT_NAMESPACE::raiseException( &aUnoExc, pThis->getBridge()->getUno2Cpp() ); // has to destruct the any
++		// is here for dummy
++		return typelib_TypeClass_VOID;
++	}
++	else // else no exception occured...
++	{
++		// temporary params
++		for ( ; nTempIndizes--; )
++		{
++			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
++			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
++			
++			if ( pParams[nIndex].bOut ) // inout/out
++			{
++				// convert and assign
++				uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
++				uno_copyAndConvertData( pCppArgs[nIndex], pUnoArgs[nIndex], pParamTypeDescr,
++										pThis->getBridge()->getUno2Cpp() );
++			}
++			// destroy temp uno param
++			uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 );
++			
++			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++		}
++		// return
++		if ( pCppReturn ) // has complex return
++		{
++			if ( pUnoReturn != pCppReturn ) // needs reconversion
++			{
++				uno_copyAndConvertData( pCppReturn, pUnoReturn, pReturnTypeDescr,
++										pThis->getBridge()->getUno2Cpp() );
++				// destroy temp uno return
++				uno_destructData( pUnoReturn, pReturnTypeDescr, 0 );
++			}
++			// complex return ptr is set to return reg
++			*(void **)pRegisterReturn = pCppReturn;
++		}
++		if ( pReturnTypeDescr )
++		{
++			typelib_TypeClass eRet = (typelib_TypeClass)pReturnTypeDescr->eTypeClass;
++			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
++			return eRet;
++		}
++		else
++			return typelib_TypeClass_VOID;
++	}
++}
++
++
++//==================================================================================================
++extern "C" typelib_TypeClass cpp_vtable_call(
++	sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
++	void ** gpreg, void ** fpreg, void ** ovrflw,
++	sal_uInt64 * pRegisterReturn /* space for register return */ )
++{
++	// gpreg:  [ret *], this, [other gpr params]
++	// fpreg:  [fpr params]
++	// ovrflw: [gpr or fpr params (properly aligned)]
++	void * pThis;
++	if ( nFunctionIndex & 0x80000000 )
++	{
++		nFunctionIndex &= 0x7fffffff;
++		pThis = gpreg[1];
++	}
++	else
++	{
++		pThis = gpreg[0];
++	}
++	pThis = static_cast<char *>( pThis ) - nVtableOffset;
++
++	bridges::cpp_uno::shared::CppInterfaceProxy * pCppI =
++		bridges::cpp_uno::shared::CppInterfaceProxy::castInterfaceToProxy( pThis );
++
++	typelib_InterfaceTypeDescription * pTypeDescr = pCppI->getTypeDescr();
++
++	OSL_ENSURE( nFunctionIndex < pTypeDescr->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
++	if ( nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex )
++	{
++		throw RuntimeException( OUString::createFromAscii("illegal vtable index!"),
++								reinterpret_cast<XInterface *>( pCppI ) );
++	}
++
++	// determine called method
++	sal_Int32 nMemberPos = pTypeDescr->pMapFunctionIndexToMemberIndex[nFunctionIndex];
++	OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### illegal member index!\n" );
++
++	TypeDescription aMemberDescr( pTypeDescr->ppAllMembers[nMemberPos] );
++
++	typelib_TypeClass eRet;
++	switch ( aMemberDescr.get()->eTypeClass )
++	{
++		case typelib_TypeClass_INTERFACE_ATTRIBUTE:
++		{
++			typelib_TypeDescriptionReference *pAttrTypeRef = 
++				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( aMemberDescr.get() )->pAttributeTypeRef;
++
++			if ( pTypeDescr->pMapMemberIndexToFunctionIndex[nMemberPos] == nFunctionIndex )
++			{
++				// is GET method
++				eRet = cpp2uno_call( pCppI, aMemberDescr.get(), pAttrTypeRef,
++						0, 0, // no params
++						gpreg, fpreg, ovrflw, pRegisterReturn );
++			}
++			else
++			{
++				// is SET method
++				typelib_MethodParameter aParam;
++				aParam.pTypeRef = pAttrTypeRef;
++				aParam.bIn		= sal_True;
++				aParam.bOut		= sal_False;
++
++				eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
++						0, // indicates void return
++						1, &aParam,
++						gpreg, fpreg, ovrflw, pRegisterReturn );
++			}
++			break;
++		}
++		case typelib_TypeClass_INTERFACE_METHOD:
++		{
++			// is METHOD
++			switch ( nFunctionIndex )
++			{
++				case 1: // acquire()
++					pCppI->acquireProxy(); // non virtual call!
++					eRet = typelib_TypeClass_VOID;
++					break;
++				case 2: // release()
++					pCppI->releaseProxy(); // non virtual call!
++					eRet = typelib_TypeClass_VOID;
++					break;
++				case 0: // queryInterface() opt
++				{
++					typelib_TypeDescription * pTD = 0;
++					TYPELIB_DANGER_GET( &pTD, reinterpret_cast<Type *>( gpreg[2] )->getTypeLibType() );
++					if ( pTD )
++					{
++						XInterface * pInterface = 0;
++						(*pCppI->getBridge()->getCppEnv()->getRegisteredInterface)
++							( pCppI->getBridge()->getCppEnv(),
++							  (void **)&pInterface,
++							  pCppI->getOid().pData,
++							  reinterpret_cast<typelib_InterfaceTypeDescription *>( pTD ) );
++
++						if ( pInterface )
++						{
++							::uno_any_construct( reinterpret_cast<uno_Any *>( gpreg[0] ),
++												 &pInterface, pTD, cpp_acquire );
++
++							pInterface->release();
++							TYPELIB_DANGER_RELEASE( pTD );
++
++							reinterpret_cast<void **>( pRegisterReturn )[0] = gpreg[0];
++							eRet = typelib_TypeClass_ANY;
++							break;
++						}
++						TYPELIB_DANGER_RELEASE( pTD );
++					}
++				} // else perform queryInterface()
++				default:
++				{
++					typelib_InterfaceMethodTypeDescription *pMethodTD =
++						reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( aMemberDescr.get() );
++
++					eRet = cpp2uno_call( pCppI, aMemberDescr.get(),
++										 pMethodTD->pReturnTypeRef,
++										 pMethodTD->nParams,
++										 pMethodTD->pParams,
++										 gpreg, fpreg, ovrflw, pRegisterReturn );
++				}
++			}
++			break;
++		}
++		default:
++		{
++			throw RuntimeException( OUString::createFromAscii("no member description found!"),
++									reinterpret_cast<XInterface *>( pCppI ) );
++			// is here for dummy
++			eRet = typelib_TypeClass_VOID;
++		}
++	}
++
++	return eRet;
++}
++
++//==================================================================================================
++extern "C" void privateSnippetExecutor( ... );
++
++const int codeSnippetSize = 24;
++
++// Generate a trampoline that redirects method calls to
++// privateSnippetExecutor().
++//
++// privateSnippetExecutor() saves all the registers that are used for
++// parameter passing on x86_64, and calls the cpp_vtable_call().
++// When it returns, privateSnippetExecutor() sets the return value.
++//
++// Note: The code snippet we build here must not create a stack frame,
++// otherwise the UNO exceptions stop working thanks to non-existing
++// unwinding info.
++unsigned char * codeSnippet( unsigned char * code,
++        sal_Int32 nFunctionIndex, sal_Int32 nVtableOffset,
++        bool bHasHiddenParam ) SAL_THROW( () )
++{
++	sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) << 32 ) | ( (sal_uInt64) nFunctionIndex );
++
++	if ( bHasHiddenParam )
++		nOffsetAndIndex |= 0x80000000;
++
++	// movq $<nOffsetAndIndex>, %r10
++	*reinterpret_cast<sal_uInt16 *>( code ) = 0xba49;
++	*reinterpret_cast<sal_uInt64 *>( code + 2 ) = nOffsetAndIndex;
++
++	// movq $<address of the privateSnippetExecutor>, %r11
++	*reinterpret_cast<sal_uInt16 *>( code + 10 ) = 0xbb49;
++	*reinterpret_cast<sal_uInt64 *>( code + 12 ) = reinterpret_cast<sal_uInt64>( privateSnippetExecutor );
++
++	// jmpq *%r11
++	*reinterpret_cast<sal_uInt32 *>( code + 20 ) = 0x00e3ff49;
++
++	return code + codeSnippetSize;
++}
++
++//==================================================================================================
++void ** bridges::cpp_uno::shared::VtableFactory::mapBlockToVtable( void * block )
++{
++	return static_cast<void **>( block ) + 2;
++}
++
++//==================================================================================================
++sal_Size bridges::cpp_uno::shared::VtableFactory::getBlockSize(
++    sal_Int32 slotCount)
++{
++    return ( slotCount + 2 ) * sizeof( void * ) + slotCount * codeSnippetSize;
++}
++
++//==================================================================================================
++void ** bridges::cpp_uno::shared::VtableFactory::initializeBlock( void * block )
++{
++	void ** slots = mapBlockToVtable( block );
++	slots[-2] = 0;
++	slots[-1] = 0;
++
++	return slots;
++}
++
++//==================================================================================================
++
++unsigned char * bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
++	void ** slots, unsigned char * code,
++	typelib_InterfaceTypeDescription const * type, sal_Int32 nFunctionOffset,
++	sal_Int32 functionCount, sal_Int32 nVtableOffset )
++{
++	for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
++	{
++		typelib_TypeDescription * pTD = 0;
++
++		TYPELIB_DANGER_GET( &pTD, type->ppMembers[ nPos ] );
++		OSL_ASSERT( pTD );
++
++		if ( typelib_TypeClass_INTERFACE_ATTRIBUTE == pTD->eTypeClass )
++		{
++			typelib_InterfaceAttributeTypeDescription *pAttrTD =
++				reinterpret_cast<typelib_InterfaceAttributeTypeDescription *>( pTD );
++
++			// get method
++			*slots++ = code;
++			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++								x86_64::return_in_hidden_param( pAttrTD->pAttributeTypeRef ) );
++
++			if ( ! pAttrTD->bReadOnly )
++			{
++				// set method
++				*slots++ = code;
++				code = codeSnippet( code, nFunctionOffset++, nVtableOffset, false );
++			}
++		}
++		else if ( typelib_TypeClass_INTERFACE_METHOD == pTD->eTypeClass )
++		{
++			typelib_InterfaceMethodTypeDescription *pMethodTD =
++				reinterpret_cast<typelib_InterfaceMethodTypeDescription *>( pTD );
++			
++			*slots++ = code;
++			code = codeSnippet( code, nFunctionOffset++, nVtableOffset,
++								x86_64::return_in_hidden_param( pMethodTD->pReturnTypeRef ) );
++		}
++		else
++			OSL_ASSERT( false );
++
++		TYPELIB_DANGER_RELEASE( pTD );
++	}
++	return code;
++}
++
++//==================================================================================================
++void bridges::cpp_uno::shared::VtableFactory::flushCode(
++	unsigned char const *, unsigned char const * )
++{
++}
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/except.cxx	Mon May  8 17:19:14 2006
+@@ -0,0 +1,334 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include <stdio.h>
++#include <dlfcn.h>
++#include <cxxabi.h>
++#include <hash_map>
++
++#include <rtl/strbuf.hxx>
++#include <rtl/ustrbuf.hxx>
++#include <osl/diagnose.h>
++#include <osl/mutex.hxx>
++
++#include <com/sun/star/uno/genfunc.hxx>
++#include "com/sun/star/uno/RuntimeException.hpp"
++#include <typelib/typedescription.hxx>
++#include <uno/any2.h>
++
++#include "share.hxx"
++
++
++using namespace ::std;
++using namespace ::osl;
++using namespace ::rtl;
++using namespace ::com::sun::star::uno;
++using namespace ::__cxxabiv1;
++
++
++namespace CPPU_CURRENT_NAMESPACE
++{
++    
++void dummy_can_throw_anything( char const * )
++{
++}
++
++//==================================================================================================
++static OUString toUNOname( char const * p ) SAL_THROW( () )
++{
++#if OSL_DEBUG_LEVEL > 1
++    char const * start = p;
++#endif
++    
++    // example: N3com3sun4star4lang24IllegalArgumentExceptionE
++    
++	OUStringBuffer buf( 64 );
++    OSL_ASSERT( 'N' == *p );
++    ++p; // skip N
++    
++    while ('E' != *p)
++    {
++        // read chars count
++        long n = (*p++ - '0');
++        while ('0' <= *p && '9' >= *p)
++        {
++            n *= 10;
++            n += (*p++ - '0');
++        }
++        buf.appendAscii( p, n );
++        p += n;
++        if ('E' != *p)
++            buf.append( (sal_Unicode)'.' );
++    }
++    
++#if OSL_DEBUG_LEVEL > 1
++    OUString ret( buf.makeStringAndClear() );
++    OString c_ret( OUStringToOString( ret, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> toUNOname(): %s => %s\n", start, c_ret.getStr() );
++    return ret;
++#else
++    return buf.makeStringAndClear();
++#endif
++}
++
++//==================================================================================================
++class RTTI
++{
++    typedef hash_map< OUString, type_info *, OUStringHash > t_rtti_map;
++    
++    Mutex m_mutex;
++	t_rtti_map m_rttis;
++    t_rtti_map m_generatedRttis;
++
++    void * m_hApp;
++    
++public:
++    RTTI() SAL_THROW( () );
++    ~RTTI() SAL_THROW( () );
++    
++    type_info * getRTTI( typelib_CompoundTypeDescription * ) SAL_THROW( () );
++};
++//__________________________________________________________________________________________________
++RTTI::RTTI() SAL_THROW( () )
++    : m_hApp( dlopen( 0, RTLD_NOW | RTLD_GLOBAL ) )
++{
++}
++//__________________________________________________________________________________________________
++RTTI::~RTTI() SAL_THROW( () )
++{
++    dlclose( m_hApp );
++}
++
++//__________________________________________________________________________________________________
++type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THROW( () )
++{
++    type_info * rtti;
++    
++    OUString const & unoName = *(OUString const *)&pTypeDescr->aBase.pTypeName;
++    
++    MutexGuard guard( m_mutex );
++    t_rtti_map::const_iterator iFind( m_rttis.find( unoName ) );
++    if (iFind == m_rttis.end())
++    {
++        // RTTI symbol
++        OStringBuffer buf( 64 );
++        buf.append( RTL_CONSTASCII_STRINGPARAM("_ZTIN") );
++        sal_Int32 index = 0;
++        do
++        {
++            OUString token( unoName.getToken( 0, '.', index ) );
++            buf.append( token.getLength() );
++            OString c_token( OUStringToOString( token, RTL_TEXTENCODING_ASCII_US ) );
++            buf.append( c_token );
++        }
++        while (index >= 0);
++        buf.append( 'E' );
++        
++        OString symName( buf.makeStringAndClear() );
++        rtti = (type_info *)dlsym( RTLD_DEFAULT, symName.getStr() );
++
++        if (rtti)
++        {
++            pair< t_rtti_map::iterator, bool > insertion(
++                m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
++            OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" );
++        }
++        else
++        {
++            // try to lookup the symbol in the generated rtti map
++            t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) );
++            if (iFind == m_generatedRttis.end())
++            {
++                // we must generate it !
++                // symbol and rtti-name is nearly identical,
++                // the symbol is prefixed with _ZTI
++                char const * rttiName = symName.getStr() +4;
++#if OSL_DEBUG_LEVEL > 1
++                fprintf( stderr,"generated rtti for %s\n", rttiName );
++#endif
++                if (pTypeDescr->pBaseTypeDescription)
++                {
++                    // ensure availability of base
++                    type_info * base_rtti = getRTTI(
++                        (typelib_CompoundTypeDescription *)pTypeDescr->pBaseTypeDescription );
++                    rtti = new __si_class_type_info(
++                        strdup( rttiName ), (__class_type_info *)base_rtti );
++                }
++                else
++                {
++                    // this class has no base class
++                    rtti = new __class_type_info( strdup( rttiName ) );
++                }
++                
++                pair< t_rtti_map::iterator, bool > insertion(
++                    m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) );
++                OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" );
++            }
++            else // taking already generated rtti
++            {
++                rtti = iFind->second;
++            }
++        }
++    }
++    else
++    {
++        rtti = iFind->second;
++    }
++    
++    return rtti;
++}
++
++//--------------------------------------------------------------------------------------------------
++static void deleteException( void * pExc )
++{
++    __cxa_exception const * header = ((__cxa_exception const *)pExc - 1);
++    typelib_TypeDescription * pTD = 0;
++    OUString unoName( toUNOname( header->exceptionType->name() ) );
++    ::typelib_typedescription_getByName( &pTD, unoName.pData );
++    OSL_ENSURE( pTD, "### unknown exception type! leaving out destruction => leaking!!!" );
++    if (pTD)
++    {
++		::uno_destructData( pExc, pTD, cpp_release );
++		::typelib_typedescription_release( pTD );
++	}
++}
++
++//==================================================================================================
++void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
++{
++#if OSL_DEBUG_LEVEL > 1
++    OString cstr(
++        OUStringToOString(
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> uno exception occured: %s\n", cstr.getStr() );
++#endif
++    void * pCppExc;
++    type_info * rtti;
++
++    {
++    // construct cpp exception object
++	typelib_TypeDescription * pTypeDescr = 0;
++	TYPELIB_DANGER_GET( &pTypeDescr, pUnoExc->pType );
++    OSL_ASSERT( pTypeDescr );
++    if (! pTypeDescr)
++    {
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("cannot get typedescription for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
++    }
++
++	pCppExc = __cxa_allocate_exception( pTypeDescr->nSize );
++	::uno_copyAndConvertData( pCppExc, pUnoExc->pData, pTypeDescr, pUno2Cpp );
++
++	// destruct uno exception
++	::uno_any_destruct( pUnoExc, 0 );
++    // avoiding locked counts
++    static RTTI * s_rtti = 0;
++    if (! s_rtti)
++    {
++        MutexGuard guard( Mutex::getGlobalMutex() );
++        if (! s_rtti)
++        {
++#ifdef LEAK_STATIC_DATA
++            s_rtti = new RTTI();
++#else
++            static RTTI rtti_data;
++            s_rtti = &rtti_data;
++#endif
++        }
++    }
++	rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
++    TYPELIB_DANGER_RELEASE( pTypeDescr );
++    OSL_ENSURE( rtti, "### no rtti for throwing exception!" );
++    if (! rtti)
++    {
++        throw RuntimeException(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no rtti for type ") ) +
++            *reinterpret_cast< OUString const * >( &pUnoExc->pType->pTypeName ),
++            Reference< XInterface >() );
++    }
++    }
++
++	__cxa_throw( pCppExc, rtti, deleteException );
++}
++
++//==================================================================================================
++void fillUnoException( __cxa_exception * header, uno_Any * pUnoExc, uno_Mapping * pCpp2Uno )
++{
++    if (! header)
++    {
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("no exception header!") ),
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if OSL_DEBUG_LEVEL > 0
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
++#endif
++        return;
++    }
++
++	typelib_TypeDescription * pExcTypeDescr = 0;
++    OUString unoName( toUNOname( header->exceptionType->name() ) );
++#if OSL_DEBUG_LEVEL > 1
++    OString cstr_unoName( OUStringToOString( unoName, RTL_TEXTENCODING_ASCII_US ) );
++    fprintf( stderr, "> c++ exception occured: %s\n", cstr_unoName.getStr() );
++#endif
++	typelib_typedescription_getByName( &pExcTypeDescr, unoName.pData );
++    if (0 == pExcTypeDescr)
++    {
++        RuntimeException aRE(
++            OUString( RTL_CONSTASCII_USTRINGPARAM("exception type not found: ") ) + unoName,
++            Reference< XInterface >() );
++        Type const & rType = ::getCppuType( &aRE );
++        uno_type_any_constructAndConvert( pUnoExc, &aRE, rType.getTypeLibType(), pCpp2Uno );
++#if OSL_DEBUG_LEVEL > 0
++        OString cstr( OUStringToOString( aRE.Message, RTL_TEXTENCODING_ASCII_US ) );
++        OSL_ENSURE( 0, cstr.getStr() );
++#endif
++    }
++    else
++    {
++        // construct uno exception any
++        uno_any_constructAndConvert( pUnoExc, header->adjustedPtr, pExcTypeDescr, pCpp2Uno );
++        typelib_typedescription_release( pExcTypeDescr );
++    }
++}
++
++}
++
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/makefile.mk	Mon May  8 17:17:43 2006
+@@ -0,0 +1,92 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++PRJ=..$/..$/..
++
++PRJNAME=bridges
++TARGET=gcc3_uno
++LIBTARGET=no
++ENABLE_EXCEPTIONS=TRUE
++NO_BSYMBOLIC=TRUE
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  svpre.mk
++.INCLUDE :  settings.mk
++.INCLUDE :  sv.mk
++
++# --- Files --------------------------------------------------------
++
++.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3"
++
++.IF "$(cppu_no_leak)" == ""
++CFLAGS += -DLEAK_STATIC_DATA
++.ENDIF
++
++NOOPTFILES= \
++	$(SLO)$/uno2cpp.obj
++
++
++CFLAGSNOOPT=-O0
++
++SLOFILES= \
++	$(SLO)$/abi.obj			\
++	$(SLO)$/except.obj		\
++	$(SLO)$/cpp2uno.obj		\
++	$(SLO)$/uno2cpp.obj		\
++	$(SLO)$/call.obj
++
++SHL1TARGET= $(TARGET)
++
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++SHL1IMPLIB=i$(TARGET)
++SHL1VERSIONMAP=..$/..$/bridge_exports.map
++
++SHL1OBJS = $(SLOFILES)
++SHL1LIBS = $(SLB)$/cpp_uno_shared.lib
++
++SHL1STDLIBS= \
++	$(CPPULIB)			\
++	$(SALLIB)
++
++.ENDIF
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++$(SLO)$/%.obj: %.s
++    $(CC) -c -o $(SLO)$/$(@:b).o $<
++    touch $@
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/share.hxx	Wed Mar  8 03:51:06 2006
+@@ -0,0 +1,98 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include "uno/mapping.h"
++
++#include <typeinfo>
++#include <exception>
++#include <cstddef>
++
++namespace CPPU_CURRENT_NAMESPACE
++{
++
++void dummy_can_throw_anything( char const * );
++
++// ----- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h
++
++struct _Unwind_Exception
++{
++    unsigned exception_class __attribute__((__mode__(__DI__)));
++    void * exception_cleanup;
++    unsigned private_1 __attribute__((__mode__(__word__)));
++    unsigned private_2 __attribute__((__mode__(__word__)));
++} __attribute__((__aligned__));
++
++struct __cxa_exception
++{ 
++    ::std::type_info *exceptionType;
++    void (*exceptionDestructor)(void *); 
++    
++    ::std::unexpected_handler unexpectedHandler;
++    ::std::terminate_handler terminateHandler;
++    
++    __cxa_exception *nextException;
++    
++    int handlerCount;
++    
++    int handlerSwitchValue;
++    const unsigned char *actionRecord;
++    const unsigned char *languageSpecificData;
++    void *catchTemp;
++    void *adjustedPtr;
++    
++    _Unwind_Exception unwindHeader;
++};    
++
++extern "C" void *__cxa_allocate_exception(
++    std::size_t thrown_size ) throw();
++extern "C" void __cxa_throw (
++    void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn));
++
++struct __cxa_eh_globals
++{
++    __cxa_exception *caughtExceptions;
++    unsigned int uncaughtExceptions;
++};
++extern "C" __cxa_eh_globals *__cxa_get_globals () throw();
++
++// -----
++
++//==================================================================================================
++void raiseException(
++    uno_Any * pUnoExc, uno_Mapping * pUno2Cpp );
++//==================================================================================================
++void fillUnoException(
++    __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno );
++}
+--- /dev/null	Wed Dec 31 19:00:00 1969
++++ bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx	Wed Mar  8 03:51:19 2006
+@@ -0,0 +1,645 @@
++/*************************************************************************
++ *
++ *  OpenOffice.org - a multi-platform office productivity suite
++ *
++ *  $RCSfile$
++ *
++ *  $Revision$
++ *
++ *  last change: $Author$ $Date$
++ *
++ *  The Contents of this file are made available subject to
++ *  the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ *    GNU Lesser General Public License Version 2.1
++ *    =============================================
++ *    Copyright 2005 by Sun Microsystems, Inc.
++ *    901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ *    This library is free software; you can redistribute it and/or
++ *    modify it under the terms of the GNU Lesser General Public
++ *    License version 2.1, as published by the Free Software Foundation.
++ *
++ *    This library is distributed in the hope that it will be useful,
++ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *    Lesser General Public License for more details.
++ *
++ *    You should have received a copy of the GNU Lesser General Public
++ *    License along with this library; if not, write to the Free Software
++ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ *    MA  02111-1307  USA
++ *
++ ************************************************************************/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <rtl/alloc.h>
++
++#include <com/sun/star/uno/genfunc.hxx>
++#include "com/sun/star/uno/RuntimeException.hpp"
++#include <uno/data.h>
++
++#include <bridges/cpp_uno/shared/bridge.hxx>
++#include <bridges/cpp_uno/shared/types.hxx>
++#include "bridges/cpp_uno/shared/unointerfaceproxy.hxx"
++#include "bridges/cpp_uno/shared/vtables.hxx"
++
++#include "share.hxx"
++
++using namespace ::rtl;
++using namespace ::com::sun::star::uno;
++
++void dummy_can_throw_anything( char const * );
++
++// 6 integral parameters are passed in registers
++const sal_uInt32 GPR_COUNT = 6;
++
++// 8 floating point parameters are passed in SSE registers
++const sal_uInt32 FPR_COUNT = 8;
++
++static inline void
++invoke_count_words(char *		pPT,      // Parameter Types
++				   sal_uInt32 &	nr_gpr,   // Number of arguments in GPRs
++				   sal_uInt32 &	nr_fpr,   // Number of arguments in FPRs
++				   sal_uInt32 &	nr_stack) // Number of arguments in stack
++{
++	nr_gpr = 0;
++	nr_fpr = 0;
++	nr_stack = 0;
++	char c;
++	
++	while ((c = *pPT++) != 'X')
++	{
++		if (c == 'F' || c == 'D')
++		{
++            if (nr_fpr < FPR_COUNT)
++                nr_fpr++;
++            else
++                nr_stack++;
++		}
++		else
++		{
++            if (nr_gpr < GPR_COUNT)
++                nr_gpr++;
++            else
++                nr_stack++;
++		}
++	}
++}
++
++static void
++invoke_copy_to_stack(sal_uInt64 * pDS,  // Stack Storage
++					 char *       pPT,  // Parameter Types
++					 sal_uInt64 * pSV,  // Source Values
++					 sal_uInt64 * pGPR, // General Purpose Registers
++					 double *     pFPR) // Floating-Point Registers
++{
++	sal_uInt32 nr_gpr = 0;
++	sal_uInt32 nr_fpr = 0;
++	sal_uInt64 value;
++	char c;
++	
++	while ((c = *pPT++) != 'X')
++	{
++		switch (c)
++		{
++		case 'D': // Double
++			if (nr_fpr < FPR_COUNT)
++				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
++			else
++				*pDS++ = *pSV++;
++			break;
++
++		case 'F': // Float
++			if (nr_fpr < FPR_COUNT)
++                // The value in %xmm register is already prepared to
++                // be retrieved as a float. Therefore, we pass the
++                // value verbatim, as a double without conversion.
++				pFPR[nr_fpr++] = *reinterpret_cast<double *>( pSV++ );
++			else
++				*pDS++ = *reinterpret_cast<double *>( pSV++ );
++			break;
++
++		case 'H': // 64-bit Word
++			if (nr_gpr < GPR_COUNT)
++				pGPR[nr_gpr++] = *pSV++;
++			else
++				*pDS++ = *pSV++;
++			break;
++
++		case 'I': // 32-bit Word
++			if (nr_gpr < GPR_COUNT)
++				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt32 *>( pSV++ );
++			else
++				*pDS++ = *reinterpret_cast<sal_uInt32 *>( pSV++ );
++			break;
++
++		case 'S': // 16-bit Word
++			if (nr_gpr < GPR_COUNT)
++				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt16 *>( pSV++ );
++			else
++				*pDS++ = *reinterpret_cast<sal_uInt16 *>( pSV++ );
++			break;
++
++		case 'B': // Byte
++			if (nr_gpr < GPR_COUNT)
++				pGPR[nr_gpr++] = *reinterpret_cast<sal_uInt8 *>( pSV++ );
++			else
++				*pDS++ = *reinterpret_cast<sal_uInt8 *>( pSV++ );
++			break;
++
++		default: // Default, assume 64-bit values
++			if (nr_gpr < GPR_COUNT)
++				pGPR[nr_gpr++] = *pSV++;
++			else
++				*pDS++ = *pSV++;
++			break;
++		}
++	}
++}
++
++//==================================================================================================
++static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex,
++							  void * pRegisterReturn, typelib_TypeClass eReturnType,
++							  char * pPT, sal_uInt64 * pStackLongs, sal_uInt32 nStackLongs)
++{
++	sal_uInt32 nr_gpr, nr_fpr, nr_stack;
++	invoke_count_words(pPT, nr_gpr, nr_fpr, nr_stack);
++
++	// Stack, if used, must be 16-bytes aligned
++	if (nr_stack)
++		nr_stack = (nr_stack + 1) & ~1;
++	
++	bool bReturnsSimpleType = bridges::cpp_uno::shared::isSimpleType( eReturnType );
++
++#if OSL_DEBUG_LEVEL > 1
++	// Let's figure out what is really going on here
++	fprintf(stderr,"callVirtualMethod() parameters string is %s\n", pPT);
++	{
++		sal_uInt32  k = nStackLongs;
++		sal_uInt64 *q = pStackLongs;
++		while (k > 0)
++		{
++			fprintf(stderr, "uno stack is: %lx\n", *q);
++			k--;
++			q++;
++		}
++	}
++#endif
++
++	// Load parameters to stack, if necessary
++    sal_uInt64 *stack = (sal_uInt64 *) __builtin_alloca(nr_stack * 8);
++    sal_uInt64 gpregs[GPR_COUNT];
++    double fpregs[FPR_COUNT];
++    invoke_copy_to_stack(stack, pPT, pStackLongs, gpregs, fpregs);
++
++    // Load FPR registers from fpregs[]
++    register double d0 asm("xmm0");
++    register double d1 asm("xmm1");
++    register double d2 asm("xmm2");
++    register double d3 asm("xmm3");
++    register double d4 asm("xmm4");
++    register double d5 asm("xmm5");
++    register double d6 asm("xmm6");
++    register double d7 asm("xmm7");
++
++    switch (nr_fpr) {
++#define ARG_FPR(N) \
++    case N+1: d##N = fpregs[N];
++        ARG_FPR(7);
++        ARG_FPR(6);
++        ARG_FPR(5);
++        ARG_FPR(4);
++        ARG_FPR(3);
++        ARG_FPR(2);
++        ARG_FPR(1);
++        ARG_FPR(0);
++    case 0:;
++#undef ARG_FPR
++    }
++    
++    // Load GPR registers from gpregs[]
++    register sal_uInt64 a0 asm("rdi");
++    register sal_uInt64 a1 asm("rsi");
++    register sal_uInt64 a2 asm("rdx");
++    register sal_uInt64 a3 asm("rcx");
++    register sal_uInt64 a4 asm("r8");
++    register sal_uInt64 a5 asm("r9");
++    
++    switch (nr_gpr) {
++#define ARG_GPR(N) \
++    case N+1: a##N = gpregs[N];
++        ARG_GPR(5);
++        ARG_GPR(4);
++        ARG_GPR(3);
++        ARG_GPR(2);
++        ARG_GPR(1);
++        ARG_GPR(0);
++    case 0:;
++#undef ARG_GPR
++    }
++
++	if ( bReturnsSimpleType )
++		a0 = (sal_uInt64) pThis;
++	else
++		a1 = (sal_uInt64) pThis;
++
++    // Ensure that assignments to SSE registers won't be optimized away
++    asm("" ::
++        "x" (d0), "x" (d1), "x" (d2), "x" (d3),
++        "x" (d4), "x" (d5), "x" (d6), "x" (d7));
++
++    // Get pointer to method
++    sal_uInt64 pMethod = *((sal_uInt64 *)pThis);
++    pMethod += 8 * nVtableIndex;
++    pMethod = *((sal_uInt64 *)pMethod);
++
++	union ReturnValue {
++		struct {
++			sal_uInt64 rax;
++			sal_uInt64 rdx;
++		} i;
++		struct {
++			double xmm0;
++			double xmm1;
++		} f;
++	};
++
++	typedef ReturnValue (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
++
++	// Perform the call
++	ReturnValue aRet = ( ( FunctionCall ) pMethod )( a0, a1, a2, a3, a4, a5 );
++
++	switch (eReturnType)
++	{
++	case typelib_TypeClass_HYPER:
++	case typelib_TypeClass_UNSIGNED_HYPER:
++		*reinterpret_cast<sal_uInt64 *>( pRegisterReturn ) = aRet.i.rax;
++		break;
++	case typelib_TypeClass_LONG:
++	case typelib_TypeClass_UNSIGNED_LONG:
++	case typelib_TypeClass_ENUM:
++		*reinterpret_cast<sal_uInt32 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt32*>( &aRet.i.rax );
++		break;
++	case typelib_TypeClass_CHAR:
++	case typelib_TypeClass_SHORT:
++	case typelib_TypeClass_UNSIGNED_SHORT:
++		*reinterpret_cast<sal_uInt16 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt16*>( &aRet.i.rax );
++		break;
++	case typelib_TypeClass_BOOLEAN:
++	case typelib_TypeClass_BYTE:
++		*reinterpret_cast<sal_uInt8 *>( pRegisterReturn ) = *reinterpret_cast<sal_uInt8*>( &aRet.i.rax );
++		break;
++	case typelib_TypeClass_FLOAT:
++		*reinterpret_cast<float *>( pRegisterReturn ) = *reinterpret_cast<float*>( &aRet.f.xmm0 );
++		break;
++	case typelib_TypeClass_DOUBLE:
++		*reinterpret_cast<double *>( pRegisterReturn ) = *reinterpret_cast<double*>( &aRet.f.xmm0 );
++		break;
++	}
++}
++
++
++//================================================================================================== 
++static void cpp_call(
++	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis,
++	bridges::cpp_uno::shared::VtableSlot aVtableSlot,
++	typelib_TypeDescriptionReference * pReturnTypeRef,
++	sal_Int32 nParams, typelib_MethodParameter * pParams,
++	void * pUnoReturn, void * pUnoArgs[], uno_Any ** ppUnoExc )
++{
++	// Maxium space for [complex ret ptr], values | ptr ...
++  	char * pCppStack		= (char *)__builtin_alloca( (nParams + 3) * sizeof(sal_uInt64) );
++  	char * pCppStackStart	= pCppStack;
++
++	// We need to know parameter types for callVirtualMethod() so generate a signature string
++	char * pParamType		= (char *)__builtin_alloca( nParams + 3 );
++	char * pPT				= pParamType;
++
++	// Return
++	typelib_TypeDescription * pReturnTypeDescr = 0;
++	TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
++	OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" );
++	
++	void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion
++	
++	if (pReturnTypeDescr)
++	{
++		if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
++		{
++			pCppReturn = pUnoReturn; // direct way for simple types
++		}
++		else
++		{
++			// complex return via ptr
++			pCppReturn = *(void **)pCppStack = (bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTypeDescr )
++												? __builtin_alloca( pReturnTypeDescr->nSize )
++												: pUnoReturn); // direct way
++			*pPT++ = 'H';
++			pCppStack += sizeof(void *);
++		}
++	}
++
++	// Push "this" pointer
++	void * pAdjustedThisPtr = reinterpret_cast< void ** >( pThis->getCppI() ) + aVtableSlot.offset;
++	*(void **)pCppStack = pAdjustedThisPtr;
++	*pPT++ = 'H';
++	pCppStack += sizeof(void *);
++
++	// stack space
++	// Args
++	void ** pCppArgs  = (void **)alloca( 3 * sizeof(void *) * nParams );
++	// Indizes of values this have to be converted (interface conversion cpp<=>uno)
++	sal_Int32 * pTempIndizes = (sal_Int32 *)(pCppArgs + nParams);
++	// Type descriptions for reconversions
++	typelib_TypeDescription ** ppTempParamTypeDescr = (typelib_TypeDescription **)(pCppArgs + (2 * nParams));
++	
++	sal_Int32 nTempIndizes   = 0;
++	
++	for ( sal_Int32 nPos = 0; nPos < nParams; ++nPos )
++	{
++		const typelib_MethodParameter & rParam = pParams[nPos];
++		typelib_TypeDescription * pParamTypeDescr = 0;
++		TYPELIB_DANGER_GET( &pParamTypeDescr, rParam.pTypeRef );
++		
++		if (!rParam.bOut && bridges::cpp_uno::shared::isSimpleType( pParamTypeDescr ))
++		{
++			uno_copyAndConvertData( pCppArgs[nPos] = pCppStack, pUnoArgs[nPos], pParamTypeDescr,
++									pThis->getBridge()->getUno2Cpp() );
++			
++			switch (pParamTypeDescr->eTypeClass)
++			{
++				
++				// we need to know type of each param so that we know whether to use
++				// gpr or fpr to pass in parameters:
++				// Key: I - 32-bit value passed in gpr
++				//      B - byte value passed in gpr
++				//      S - short value passed in gpr
++				//      F - float value pass in fpr
++				//      D - double value pass in fpr
++				//      H - long value passed in gpr
++				//      X - indicates end of parameter description string
++				
++			case typelib_TypeClass_LONG:
++			case typelib_TypeClass_UNSIGNED_LONG:
++			case typelib_TypeClass_ENUM:
++				*pPT++ = 'I';
++				break;
++			case typelib_TypeClass_SHORT:
++			case typelib_TypeClass_CHAR:
++			case typelib_TypeClass_UNSIGNED_SHORT:
++				*pPT++ = 'S';
++				break;
++			case typelib_TypeClass_BOOLEAN:
++			case typelib_TypeClass_BYTE:
++				*pPT++ = 'B';
++				break;
++			case typelib_TypeClass_FLOAT:
++				*pPT++ = 'F';
++				break;
++			case typelib_TypeClass_DOUBLE:
++				*pPT++ = 'D';
++				break;
++			case typelib_TypeClass_HYPER:
++			case typelib_TypeClass_UNSIGNED_HYPER:
++				*pPT++ = 'H';
++				break;
++			}
++
++			// no longer needed
++			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++		}
++		else // ptr to complex value | ref
++		{
++			if (! rParam.bIn) // is pure out
++			{
++				// cpp out is constructed mem, uno out is not!
++				uno_constructData(
++					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
++					pParamTypeDescr );
++				pTempIndizes[nTempIndizes] = nPos; // default constructed for cpp call
++				// will be released at reconversion
++				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
++			}
++			// is in/inout
++			else if (bridges::cpp_uno::shared::relatesToInterfaceType( pParamTypeDescr ))
++			{
++				uno_copyAndConvertData(
++					*(void **)pCppStack = pCppArgs[nPos] = alloca( pParamTypeDescr->nSize ),
++					pUnoArgs[nPos], pParamTypeDescr, pThis->getBridge()->getUno2Cpp() );
++				
++				pTempIndizes[nTempIndizes] = nPos; // has to be reconverted
++				// will be released at reconversion
++				ppTempParamTypeDescr[nTempIndizes++] = pParamTypeDescr;
++			}
++			else // direct way
++			{
++				*(void **)pCppStack = pCppArgs[nPos] = pUnoArgs[nPos];
++				// no longer needed
++				TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++			}
++			// FIXME: is this the right way to pass these?
++			*pPT++='H';
++		}
++		pCppStack += sizeof(sal_uInt64); // standard parameter length
++	}
++	
++	// terminate the signature string
++	*pPT++ = 'X';
++	*pPT = 0;
++
++	try
++	{
++		OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 7), "UNALIGNED STACK !!! (Please DO panic)" );
++		callVirtualMethod(
++			pAdjustedThisPtr, aVtableSlot.index,
++			pCppReturn, pReturnTypeDescr->eTypeClass, pParamType,
++			(sal_uInt64 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_uInt64) );
++		// NO exception occured...
++		*ppUnoExc = 0;
++		
++		// reconvert temporary params
++		for ( ; nTempIndizes--; )
++		{
++			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
++			typelib_TypeDescription * pParamTypeDescr = ppTempParamTypeDescr[nTempIndizes];
++			
++			if (pParams[nIndex].bIn)
++			{
++				if (pParams[nIndex].bOut) // inout
++				{
++					uno_destructData( pUnoArgs[nIndex], pParamTypeDescr, 0 ); // destroy uno value
++					uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
++											pThis->getBridge()->getCpp2Uno() );
++				}
++			}
++			else // pure out
++			{
++				uno_copyAndConvertData( pUnoArgs[nIndex], pCppArgs[nIndex], pParamTypeDescr,
++										pThis->getBridge()->getCpp2Uno() );
++			}
++			// destroy temp cpp param => cpp: every param was constructed
++			uno_destructData( pCppArgs[nIndex], pParamTypeDescr, cpp_release );
++			
++			TYPELIB_DANGER_RELEASE( pParamTypeDescr );
++		}
++		// return value
++		if (pCppReturn && pUnoReturn != pCppReturn)
++		{
++			uno_copyAndConvertData( pUnoReturn, pCppReturn, pReturnTypeDescr,
++									pThis->getBridge()->getCpp2Uno() );
++			uno_destructData( pCppReturn, pReturnTypeDescr, cpp_release );
++		}
++	}
++ 	catch (...)
++ 	{
++  		// fill uno exception
++		fillUnoException( CPPU_CURRENT_NAMESPACE::__cxa_get_globals()->caughtExceptions, *ppUnoExc, pThis->getBridge()->getCpp2Uno() );
++        
++		// temporary params
++		for ( ; nTempIndizes--; )
++		{
++			sal_Int32 nIndex = pTempIndizes[nTempIndizes];
++			// destroy temp cpp param => cpp: every param was constructed
++			uno_destructData( pCppArgs[nIndex], ppTempParamTypeDescr[nTempIndizes], cpp_release );
++			TYPELIB_DANGER_RELEASE( ppTempParamTypeDescr[nTempIndizes] );
++		}
++		// return type
++		if (pReturnTypeDescr)
++			TYPELIB_DANGER_RELEASE( pReturnTypeDescr );
++	}
++}
++
++
++//==================================================================================================
++void bridges::cpp_uno::shared::UnoInterfaceProxy::dispatch(
++	uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
++	void * pReturn, void * pArgs[], uno_Any ** ppException ) SAL_THROW(())
++{
++	// is my surrogate
++	bridges::cpp_uno::shared::UnoInterfaceProxy * pThis
++		= static_cast< bridges::cpp_uno::shared::UnoInterfaceProxy * >(pUnoI);
++	typelib_InterfaceTypeDescription * pTypeDescr = pThis->pTypeDescr;
++	
++	switch (pMemberDescr->eTypeClass)
++	{
++	case typelib_TypeClass_INTERFACE_ATTRIBUTE:
++	{
++		// determine vtable call index
++		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
++		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
++		
++		VtableSlot aVtableSlot(
++				getVtableSlot(
++					reinterpret_cast<
++					typelib_InterfaceAttributeTypeDescription const * >(
++						pMemberDescr)));
++		
++		if (pReturn)
++		{
++			// dependent dispatch
++			cpp_call(
++				pThis, aVtableSlot,
++				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef,
++				0, 0, // no params
++				pReturn, pArgs, ppException );
++		}
++		else
++		{
++			// is SET
++			typelib_MethodParameter aParam;
++			aParam.pTypeRef =
++				((typelib_InterfaceAttributeTypeDescription *)pMemberDescr)->pAttributeTypeRef;
++			aParam.bIn		= sal_True;
++			aParam.bOut		= sal_False;
++
++			typelib_TypeDescriptionReference * pReturnTypeRef = 0;
++			OUString aVoidName( RTL_CONSTASCII_USTRINGPARAM("void") );
++			typelib_typedescriptionreference_new(
++				&pReturnTypeRef, typelib_TypeClass_VOID, aVoidName.pData );
++			
++			// dependent dispatch
++			aVtableSlot.index += 1; // get, then set method
++			cpp_call(
++				pThis, aVtableSlot, // get, then set method
++				pReturnTypeRef,
++				1, &aParam,
++				pReturn, pArgs, ppException );
++			
++			typelib_typedescriptionreference_release( pReturnTypeRef );
++		}
++		
++		break;
++	}
++	case typelib_TypeClass_INTERFACE_METHOD:
++	{
++		// determine vtable call index
++		sal_Int32 nMemberPos = ((typelib_InterfaceMemberTypeDescription *)pMemberDescr)->nPosition;
++		OSL_ENSURE( nMemberPos < pTypeDescr->nAllMembers, "### member pos out of range!" );
++		
++		VtableSlot aVtableSlot(
++				getVtableSlot(
++					reinterpret_cast<
++					typelib_InterfaceMethodTypeDescription const * >(
++						pMemberDescr)));
++		
++		switch (aVtableSlot.index)
++		{
++			// standard calls
++		case 1: // acquire uno interface
++			(*pUnoI->acquire)( pUnoI );
++			*ppException = 0;
++			break;
++		case 2: // release uno interface
++			(*pUnoI->release)( pUnoI );
++			*ppException = 0;
++			break;
++		case 0: // queryInterface() opt
++		{
++			typelib_TypeDescription * pTD = 0;
++			TYPELIB_DANGER_GET( &pTD, reinterpret_cast< Type * >( pArgs[0] )->getTypeLibType() );
++			if (pTD)
++			{
++                uno_Interface * pInterface = 0;
++                (*pThis->getBridge()->getUnoEnv()->getRegisteredInterface)(
++                    pThis->getBridge()->getUnoEnv(),
++                    (void **)&pInterface, pThis->oid.pData, (typelib_InterfaceTypeDescription *)pTD );
++			
++                if (pInterface)
++                {
++                    ::uno_any_construct(
++                        reinterpret_cast< uno_Any * >( pReturn ),
++                        &pInterface, pTD, 0 );
++                    (*pInterface->release)( pInterface );
++                    TYPELIB_DANGER_RELEASE( pTD );
++                    *ppException = 0;
++                    break;
++                }
++                TYPELIB_DANGER_RELEASE( pTD );
++            }
++		} // else perform queryInterface()
++		default:
++			// dependent dispatch
++			cpp_call(
++				pThis, aVtableSlot,
++				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pReturnTypeRef,
++				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->nParams,
++				((typelib_InterfaceMethodTypeDescription *)pMemberDescr)->pParams,
++				pReturn, pArgs, ppException );
++		}
++		break;
++	}
++	default:
++	{
++		::com::sun::star::uno::RuntimeException aExc(
++			OUString( RTL_CONSTASCII_USTRINGPARAM("illegal member type description!") ),
++			::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() );
++		
++		Type const & rExcType = ::getCppuType( &aExc );
++		// binary identical null reference
++		::uno_type_any_construct( *ppException, &aExc, rExcType.getTypeLibType(), 0 );
++	}
++	}
++}
diff --git a/editors/openoffice.org-3-RC/files/patch-i65468 b/editors/openoffice.org-3-RC/files/patch-i65468
new file mode 100644
index 000000000000..a0638001272e
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65468
@@ -0,0 +1,33 @@
+Index: epm/epm-3.7.patch
+===================================================================
+RCS file: /cvs/external/epm/epm-3.7.patch,v
+retrieving revision 1.9
+diff -u -r1.9 epm-3.7.patch
+--- epm/epm-3.7.patch	17 Feb 2006 16:16:42 -0000	1.9
++++ epm/epm-3.7.patch	15 May 2006 21:54:11 -0000
+@@ -659,3 +659,25 @@
+   	      putc(*s, fp);
+   	    }
+   
++*** misc/epm-3.7/bsd.c	Wed Jan 15 02:05:01 2003
++--- misc/build/epm-3.7/bsd.c	Mon May 15 13:48:17 2006
++***************
++*** 348,355 ****
++                    current, commentname, descrname, plistname, name))
++      return (1);
++  
++!   if (run_command(NULL, "mv %s.tgz %s", name, directory))
++!     return (1);
++  
++   /*
++    * Remove temporary files...
++--- 348,356 ----
++                    current, commentname, descrname, plistname, name))
++      return (1);
++  
++!   if (run_command(NULL, "mv %s.tbz %s", name, directory))
++!     if (run_command(NULL, "mv %s.tgz %s", name, directory))
++!       return (1);
++  
++   /*
++    * Remove temporary files...
diff --git a/editors/openoffice.org-3-RC/files/patch-i65511 b/editors/openoffice.org-3-RC/files/patch-i65511
new file mode 100644
index 000000000000..300a95c71487
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65511
@@ -0,0 +1,15 @@
+Index: jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+===================================================================
+RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 sunjre.cxx
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	7 Sep 2005 19:31:11 -0000	1.4
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	11 May 2006 23:00:16 -0000
+@@ -76,6 +76,7 @@
+         "/bin/classic/jvm.dll"
+ #elif UNX
+         "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
++        "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
+         "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
+ #endif
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-i65512 b/editors/openoffice.org-3-RC/files/patch-i65512
new file mode 100644
index 000000000000..1f5005a87f78
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65512
@@ -0,0 +1,43 @@
+--- sal/osl/unx/socket.c.orig	Thu Sep  8 11:01:17 2005
++++ sal/osl/unx/socket.c	Fri May  5 19:14:17 2006
+@@ -813,7 +813,7 @@
+ 	const char *name, struct hostent *result,
+ 	char *buffer, int buflen, int *h_errnop)
+ {
+-#ifdef LINUX
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 700015))
+ 	struct hostent *__result; /* will be the same as result */
+ 	int __error;
+ 	__error = gethostbyname_r (name, result, buffer, buflen,
+--- sal/osl/unx/system.c.orig	Fri Apr  7 04:06:25 2006
++++ sal/osl/unx/system.c	Fri May  5 19:18:51 2006
+@@ -343,6 +343,8 @@
+ }
+ #endif /* defined SCO */
+ 
++#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
++
+ extern int h_errno;
+ 
+ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+@@ -433,6 +435,7 @@
+ 
+   	return res;
+ }
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
+ 
+ #if defined(MACOSX)
+ /*
+--- sal/osl/unx/system.h.orig	Fri Apr  7 04:06:48 2006
++++ sal/osl/unx/system.h	Fri May  5 18:57:50 2006
+@@ -540,8 +540,10 @@
+ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
+ struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
+ #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
++#if !defined(FREEBSD) || (__FreeBSD_version < 700015)
+ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+ 								char *buffer, int buflen, int *h_errnop);
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 700015) */
+ #endif
+ 
+ #endif /* __OSL_SYSTEM_H__ */
diff --git a/editors/openoffice.org-3-RC/files/patch-i65513 b/editors/openoffice.org-3-RC/files/patch-i65513
new file mode 100644
index 000000000000..146731b44885
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65513
@@ -0,0 +1,581 @@
+--- config_office/set_soenv.in.orig	Mon May  8 11:55:43 2006
++++ config_office/set_soenv.in	Mon May 22 17:39:23 2006
+@@ -320,32 +320,60 @@
+       $XPVERSION      = "3"; 
+ }
+ elsif ( $platform =~ m/freebsd/ ) 
+-{     print "Setting FreeBSD specific values... ";
+-      $outfile        = "FreeBSDEnv.Set"; 
+-      $BIG_SVX        = "TRUE";
++{     $BIG_SVX        = "TRUE";
+       $COM            = "GCC";
+       $COMPATH        = '@COMPATH@'; 
+-      $CPU            = "I";
+-      $CPUNAME        = "INTEL";
+       $CVER           = "C300";
+       $GUI            = "UNX";
+       $GUIBASE        = "unx";
+       $GUIENV         = "sal";
+       $GVER           = "VCL";
+-      $OUTPATH        = "unxfbsd";
+-      $INPATH         = $OUTPATH.$PROEXT;
+-      $GVERDIR        = $INPATH;
+       $OS             = "FREEBSD";
+       $PATH_SEPERATOR = $ps;
+       $XPVERSION      = "3";
+       $OSVERSION      = '@OSVERSION@';
++   if ($platform =~ m/^amd64/)
++   {  my ( $JAVA_OS );
++      print "Setting FreeBSD AMD64 specific values... ";
++      $outfile        = "FreeBSDAMDEnv.Set";
++      $CPU            = "X";
++      $CPUNAME        = "X86_64";
++      $OUTPATH        = "unxfbsdx";
++      $JAVA_OS        = '@JAVA_HOME@';
++      $JAVA_OS        =~ s/.*\///;
++      if ($JAVA_OS =~ m/^linux/)
++      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
++         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
++         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
++         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
++      }
++      else
++      {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
++         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
++         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
++         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
++      }
++   }
++   elsif ($platform =~ m/^i386/)
++   {  print "Setting FreeBSD Intel specific values... ";
++      $outfile        = "FreeBSDIntelEnv.Set";
++      $CPU            = "I";
++      $CPUNAME        = "INTEL";
++      $OUTPATH        = "unxfbsdi";
+       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
+       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
+       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
+       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
+-      if( @GCCVER@ >= 30401 ) {
+-      	 $CVER        = "C341";
+-      }
++   }
++   else
++   {  print "Unsupported FreeBSD architecture: $platform \n";
++         exit 1;
++   }
++   if( @GCCVER@ >= 30401 ) {
++      $CVER        = "C341";
++   }
++      $INPATH         = $OUTPATH.$PROEXT;
++      $GVERDIR        = $INPATH;
+ } 
+ elsif ( $platform =~ m/linux-gnu/ ) 
+ {
+@@ -1294,6 +1322,7 @@
+    		{
+       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."freebsd";
+       		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."bsd";
++      		$SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."linux";
+    		}
+    		elsif ($platform =~ m/netbsd/)
+    		{  $SOLARINC   .=$I.'$JAVA_HOME'.$INCLUDE.$ds."netbsd";
+--- solenv/inc/unx.mk	Fri May 19 13:55:04 2006
++++ solenv/inc/unx.mk	Fri May 19 13:38:42 2006
+@@ -155,10 +155,9 @@
+ .INCLUDE : unxbsds.mk
+ .ENDIF
+ 
+-.IF "$(COM)$(OS)$(CPU)" == "GCCFREEBSDI"
+-.INCLUDE : unxfbsdi.mk
++.IF "$(COM)$(OS)" == "GCCFREEBSD"
++.INCLUDE : unxfbsd.mk
+ .ENDIF
+-
+ 
+ .IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
+ .INCLUDE : unxirxm3.mk
+--- solenv/inc/unxfbsd.mk	Fri May 19 13:13:25 2006
++++ solenv/inc/unxfbsd.mk	Fri May 19 13:52:02 2006
+@@ -0,0 +1,220 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++# Makefile for FreeBSD.
++
++ASM=
++AFLAGS=
++
++SOLAR_JAVA*=TRUE
++JAVAFLAGSDEBUG=-g
++
++# Include arch specific makefile.
++.IF "$(CPUNAME)" == "INTEL"
++.INCLUDE : unxfbsdi.mk
++.ENDIF
++.IF "$(CPUNAME)" == "X86_64"
++.INCLUDE : unxfbsdx.mk
++.ENDIF
++
++# filter for supressing verbose messages from linker
++#not needed at the moment
++#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
++
++# _PTHREADS is needed for the stl
++CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# this is a platform with JAVA support
++.IF "$(SOLAR_JAVA)"!=""
++JAVADEF=-DSOLAR_JAVA
++.IF "$(debug)"==""
++JAVA_RUNTIME=-ljava
++.ELSE
++JAVA_RUNTIME=-ljava_g
++.ENDIF
++.ENDIF
++
++# name of C++ Compiler
++CXX*=g++
++# name of C Compiler
++CC*=gcc
++.IF "$(SYSBASE)"!=""
++CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
++CXX+:=$(CFLAGS_SYSBASE)
++CC+:=$(CFLAGS_SYSBASE)
++.ENDIF          # "$(SYSBASE)"!=""
++CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
++
++# flags to enable build with symbols; required for crashdump feature
++.IF "$(ENABLE_SYMBOLS)"=="SMALL"
++CFLAGSENABLESYMBOLS=-g1
++.ELSE
++CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
++
++.ENDIF
++
++# flags for the C++ Compiler
++CFLAGSCC= -pipe $(ARCH_FLAGS)
++# Flags for enabling exception handling
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
++
++# -fpermissive should be removed as soon as possible
++CFLAGSCXX= -pipe $(ARCH_FLAGS)
++CFLAGSCXX+= -Wno-ctor-dtor-privacy
++PICSWITCH:=-fpic
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CFLAGSCXX += -fvisibility-inlines-hidden
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++
++# Compiler flags for compiling static object in single threaded environment with graphical user interface
++CFLAGSOBJGUIST=
++# Compiler flags for compiling static object in single threaded environment with character user interface
++CFLAGSOBJCUIST=
++# Compiler flags for compiling static object in multi threaded environment with graphical user interface
++CFLAGSOBJGUIMT=
++# Compiler flags for compiling static object in multi threaded environment with character user interface
++CFLAGSOBJCUIMT=
++# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
++CFLAGSSLOGUIMT=$(PICSWITCH)
++# Compiler flags for compiling shared object in multi threaded environment with character user interface
++CFLAGSSLOCUIMT=$(PICSWITCH)
++# Compiler flags for profiling
++CFLAGSPROF=
++# Compiler flags for debugging
++CFLAGSDEBUG=-g
++CFLAGSDBGUTIL=
++# Compiler flags for disabling optimizations
++CFLAGSNOOPT=-O0
++# Compiler flags for describing the output path
++CFLAGSOUTOBJ=-o
++# Enable all warnings
++CFLAGSWALL=-Wall
++# Set default warn level
++CFLAGSDFLTWARN=
++
++# switches for dynamic and static linking
++STATIC		= -Wl,-Bstatic
++DYNAMIC		= -Wl,-Bdynamic
++
++# name of linker
++LINK*=$(CXX)
++LINKC*=$(CC)
++
++# default linker flags
++LINKFLAGSDEFS*=#-Wl,-z,defs
++LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
++LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++
++# linker flags for linking applications
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++
++# linker flags for linking shared libraries
++LINKFLAGSSHLGUI= -shared
++LINKFLAGSSHLCUI= -shared
++
++LINKFLAGSTACK=
++LINKFLAGSPROF=
++LINKFLAGSDEBUG=-g
++LINKFLAGSOPT=
++
++# linker flags for optimization (symbol hashtable)
++# for now, applied to symbol scoped libraries, only
++LINKFLAGSOPTIMIZE*=-Wl,-O1
++LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
++
++SONAME_SWITCH=-Wl,-h
++
++# Sequence of libs does matter !
++
++STDLIBCPP=-lstdc++
++
++# default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
++STDOBJGUI=
++STDSLOGUI=
++STDOBJCUI=
++STDSLOCUI=
++
++# libraries for linking applications
++STDLIBCUIST=-lm
++STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
++STDLIBCUIMT=$(PTHREAD_LIBS) -lm
++STDLIBGUIST=-lX11 -lm
++# libraries for linking shared libraries
++STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
++STDSHLCUIMT=$(PTHREAD_LIBS) -lm
++STDSHLGUIST=-lX11 -lXext -lm
++STDSHLCUIST=-lm
++
++LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
++
++.IF "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
++LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
++.ELSE # "$(USE_STLP_DEBUG)" != ""
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++.ENDIF # "$(USE_STLP_DEBUG)" != ""
++
++#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
++
++# name of library manager
++LIBMGR=ar
++LIBFLAGS=-r
++
++# tool for generating import libraries
++IMPLIB=
++IMPLIBFLAGS=
++
++MAPSYM=
++MAPSYMFLAGS=
++
++RC=irc
++RCFLAGS=-fo$@ $(RCFILES)
++RCLINK=
++RCLINKFLAGS=
++RCSETVERSION=
++
++# platform specific identifier for shared libs
++DLLPRE=lib
++DLLPOST=.so
+--- solenv/inc/unxfbsdi.mk	Tue Jan 31 13:24:38 2006
++++ solenv/inc/unxfbsdi.mk	Fri May 19 13:52:19 2006
+@@ -33,192 +33,23 @@
+ #
+ #*************************************************************************
+ 
+-# mk file for unxfbsdi
+-ASM=
+-AFLAGS=
++#
++# FreBSD/i386 specific defines
++#
+ 
+-SOLAR_JAVA*=TRUE
+-JAVAFLAGSDEBUG=-g
+-
+-# filter for supressing verbose messages from linker
+-#not needed at the moment
+-#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
+-
+-# _PTHREADS is needed for the stl
+-CDEFS+=$(PTHREAD_CFLAGS) -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
+-
+-# enable visibility define in "sal/types.h"
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# this is a platform with JAVA support
+-.IF "$(SOLAR_JAVA)"!=""
+-JAVADEF=-DSOLAR_JAVA
+-.IF "$(debug)"==""
+-JAVA_RUNTIME=-ljava
+-.ELSE
+-JAVA_RUNTIME=-ljava_g
+-.ENDIF
+-.ENDIF
++CDEFS+=-DX86
+ 
+ # architecture dependent flags for the C and C++ compiler that can be changed by
+ # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
+ ARCH_FLAGS*=-mtune=pentiumpro
+ 
+-# name of C++ Compiler
+-CXX*=g++
+-# name of C Compiler
+-CC*=gcc
+-.IF "$(SYSBASE)"!=""
+-CFLAGS_SYSBASE:=-isystem $(SYSBASE)$/usr$/include
+-CXX+:=$(CFLAGS_SYSBASE)
+-CC+:=$(CFLAGS_SYSBASE)
+-.ENDIF          # "$(SYSBASE)"!=""
+-CFLAGS+=-Wreturn-type -fmessage-length=0 -c $(INCLUDE)
+-
+-# flags to enable build with symbols; required for crashdump feature
+-.IF "$(ENABLE_SYMBOLS)"=="SMALL"
+-CFLAGSENABLESYMBOLS=-g1
+-.ELSE
+-CFLAGSENABLESYMBOLS=-g # was temporarily commented out, reenabled before Beta
+-
+-.ENDIF
+-
+-# flags for the C++ Compiler
+-CFLAGSCC= -pipe $(ARCH_FLAGS)
+-# Flags for enabling exception handling
+-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
+-# Flags for disabling exception handling
+-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+-
+-# -fpermissive should be removed as soon as possible
+-CFLAGSCXX= -pipe $(ARCH_FLAGS)
+-CFLAGSCXX+= -Wno-ctor-dtor-privacy
+-PICSWITCH:=-fpic
+-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-CFLAGSCXX += -fvisibility-inlines-hidden
+-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+-
+-# Compiler flags for compiling static object in single threaded environment with graphical user interface
+-CFLAGSOBJGUIST=
+-# Compiler flags for compiling static object in single threaded environment with character user interface
+-CFLAGSOBJCUIST=
+-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
+-CFLAGSOBJGUIMT=
+-# Compiler flags for compiling static object in multi threaded environment with character user interface
+-CFLAGSOBJCUIMT=
+-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
+-CFLAGSSLOGUIMT=$(PICSWITCH)
+-# Compiler flags for compiling shared object in multi threaded environment with character user interface
+-CFLAGSSLOCUIMT=$(PICSWITCH)
+-# Compiler flags for profiling
+-CFLAGSPROF=
+-# Compiler flags for debugging
+-CFLAGSDEBUG=-g
+-CFLAGSDBGUTIL=
+ # Compiler flags for enabling optimizations
+ .IF "$(PRODUCT)"!=""
+ CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
+-CFLAGSOPT+=-Wuninitialized				# not supported without optimization
++CFLAGSOPT+=-Wuninitialized			# not supported without optimization
+ .ELSE 	# "$(PRODUCT)"!=""
+-CFLAGSOPT=   							# no optimizing for non products
++CFLAGSOPT=   					# no optimizing for non products
+ .ENDIF	# "$(PRODUCT)"!=""
+-# Compiler flags for disabling optimizations
+-CFLAGSNOOPT=-O0
+-# Compiler flags for describing the output path
+-CFLAGSOUTOBJ=-o
+-# Enable all warnings
+-CFLAGSWALL=-Wall
+-# Set default warn level
+-CFLAGSDFLTWARN=
+-
+-# switches for dynamic and static linking
+-STATIC		= -Wl,-Bstatic
+-DYNAMIC		= -Wl,-Bdynamic
+-
+-# name of linker
+-LINK*=$(CXX)
+-LINKC*=$(CC)
+-
+-# default linker flags
+-LINKFLAGSDEFS*=#-Wl,-z,defs
+-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+-
+-# linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-
+-# linker flags for linking shared libraries
+-LINKFLAGSSHLGUI= -shared
+-LINKFLAGSSHLCUI= -shared
+-
+-LINKFLAGSTACK=
+-LINKFLAGSPROF=
+-LINKFLAGSDEBUG=-g
+-LINKFLAGSOPT=
+-
+-# linker flags for optimization (symbol hashtable)
+-# for now, applied to symbol scoped libraries, only
+-LINKFLAGSOPTIMIZE*=-Wl,-O1
+-LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script
+-
+-SONAME_SWITCH=-Wl,-h
+-
+-# Sequence of libs does matter !
+-
+-STDLIBCPP=-lstdc++
+-
+-# default objectfilenames to link
+-STDOBJVCL=$(L)$/salmain.o
+-STDOBJGUI=
+-STDSLOGUI=
+-STDOBJCUI=
+-STDSLOCUI=
+-
+-# libraries for linking applications
+-STDLIBCUIST=-lm
+-STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
+-STDLIBCUIMT=$(PTHREAD_LIBS) -lm
+-STDLIBGUIST=-lX11 -lm
+-# libraries for linking shared libraries
+-STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
+-STDSHLCUIMT=$(PTHREAD_LIBS) -lm
+-STDSHLGUIST=-lX11 -lXext -lm
+-STDSHLCUIST=-lm
+-
+-LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+-
+-.IF "$(USE_STLP_DEBUG)" != ""
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
+-.ELSE # "$(USE_STLP_DEBUG)" != ""
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
+-.ENDIF # "$(USE_STLP_DEBUG)" != ""
+-
+-#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+-
+-# name of library manager
+-LIBMGR=ar
+-LIBFLAGS=-r
+-
+-# tool for generating import libraries
+-IMPLIB=
+-IMPLIBFLAGS=
+-
+-MAPSYM=
+-MAPSYMFLAGS=
+-
+-RC=irc
+-RCFLAGS=-fo$@ $(RCFILES)
+-RCLINK=
+-RCLINKFLAGS=
+-RCSETVERSION=
+ 
+ # platform specific identifier for shared libs
+ DLLPOSTFIX=fi
+-DLLPRE=lib
+-DLLPOST=.so
+-
+--- solenv/inc/unxfbsdx.mk	Fri May 19 13:13:25 2006
++++ solenv/inc/unxfbsdx.mk	Fri May 19 13:52:38 2006
+@@ -0,0 +1,57 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   $RCSfile$
++#
++#   $Revision$
++#
++#   last change: $Author$ $Date$
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++
++#
++# FreBSD/amd64 specific defines
++#
++
++CDEFS+=-DX86_64
++
++# architecture dependent flags for the C and C++ compiler that can be changed by
++# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
++.IF "$(CPUNAME)" == "X86_64"
++ARCH_FLAGS*=
++.ENDIF
++
++# Compiler flags for enabling optimizations
++.IF "$(PRODUCT)"!=""
++CFLAGSOPT=-O2 -fno-strict-aliasing		# optimizing for products
++CFLAGSOPT+=-Wuninitialized			# not supported without optimization
++.ELSE 	# "$(PRODUCT)"!=""
++CFLAGSOPT=   					# no optimizing for non products
++.ENDIF	# "$(PRODUCT)"!=""
++
++# platform specific identifier for shared libs
++DLLPOSTFIX=fx
diff --git a/editors/openoffice.org-3-RC/files/patch-i65514 b/editors/openoffice.org-3-RC/files/patch-i65514
new file mode 100644
index 000000000000..cec0a4c24888
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65514
@@ -0,0 +1,140 @@
+--- berkeleydb/db-4.2.52.patch.orig	Fri Dec 23 09:22:46 2005
++++ berkeleydb/db-4.2.52.patch	Fri May 19 17:44:11 2006
+@@ -205,6 +205,20 @@
+ !         $(SLO)$/dbreg_util.obj
+ ! 
+ ! .INCLUDE :  target.mk
++*** misc/db-4.2.52.NC/dist/config.hin	Wed Dec  3 16:10:00 2003
++--- misc/build/db-4.2.52.NC/dist/config.hin	Fri May 19 17:37:41 2006
++***************
++*** 193,198 ****
++--- 193,201 ----
++  /* Define to 1 to use the GCC compiler and x86 assembly language mutexes. */
++  #undef HAVE_MUTEX_X86_GCC_ASSEMBLY
++  
+++ /* Define to 1 to use the GCC compiler and x86-64 assembly language mutexes. */
+++ #undef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
+++ 
++  /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
++  #undef HAVE_NDIR_H
++  
+ *** misc/db-4.2.52.NC/dist/configure	2003-12-03 22:10:02.000000000 +0100
+ --- misc/build/db-4.2.52.NC/dist/configure	2005-12-22 18:36:14.647415000 +0100
+ ***************
+@@ -241,6 +255,76 @@
+     fi
+   
+     # Commands to make compiler produce verbose output that lists
++***************
++*** 28556,28561 ****
++--- 28556,28606 ----
++  rm -f conftest.$ac_objext conftest.$ac_ext
++  fi
++  
+++ # x86_64/gcc: FreeBSD, NetBSD, BSD/OS, Linux
+++ if test "$db_cv_mutex" = no; then
+++ cat >conftest.$ac_ext <<_ACEOF
+++ #line $LINENO "configure"
+++ /* confdefs.h.  */
+++ _ACEOF
+++ cat confdefs.h >>conftest.$ac_ext
+++ cat >>conftest.$ac_ext <<_ACEOF
+++ /* end confdefs.h.  */
+++ 
+++ int
+++ main ()
+++ {
+++ 
+++ #if (defined(__amd64__) || defined(__x86_64__)) && defined(__GNUC__)
+++ 	exit(0);
+++ #else
+++ 	FAIL TO COMPILE/LINK
+++ #endif
+++ 
+++   ;
+++   return 0;
+++ }
+++ _ACEOF
+++ rm -f conftest.$ac_objext
+++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+++   (eval $ac_compile) 2>&5
+++   ac_status=$?
+++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++   (exit $ac_status); } &&
+++          { ac_try='test -s conftest.$ac_objext'
+++   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+++   (eval $ac_try) 2>&5
+++   ac_status=$?
+++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+++   (exit $ac_status); }; }; then
+++   db_cv_mutex="x86_64/gcc-assembly"
+++ else
+++   echo "$as_me: failed program was:" >&5
+++ sed 's/^/| /' conftest.$ac_ext >&5
+++ 
+++ fi
+++ rm -f conftest.$ac_objext conftest.$ac_ext
+++ fi
+++ 
++  # S390/cc: IBM OS/390 Unix
++  if test "$db_cv_mutex" = no; then
++  cat >conftest.$ac_ext <<_ACEOF
++***************
++*** 28971,28976 ****
++--- 29016,29028 ----
++  x86/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
++  			cat >>confdefs.h <<\_ACEOF
++  #define HAVE_MUTEX_X86_GCC_ASSEMBLY 1
+++ _ACEOF
+++ 
+++ 
+++ ;;
+++ x86_64/gcc-assembly)	ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS"
+++ 			cat >>confdefs.h <<\_ACEOF
+++ #define HAVE_MUTEX_X86_64_GCC_ASSEMBLY 1
++  _ACEOF
++  
++  
+ *** misc/db-4.2.52.NC/dist/ltmain.sh	2003-04-26 19:45:37.000000000 +0200
+ --- misc/build/db-4.2.52.NC/dist/ltmain.sh	2005-12-22 18:36:14.447413000 +0100
+ ***************
+@@ -943,3 +1027,39 @@
+ ! 			$(SLO)$/xa_map.obj
+ ! 
+ ! .INCLUDE :  target.mk
++*** misc/db-4.2.52.NC/dbinc/mutex.h	Sat Sep 20 17:40:49 2003
++--- misc/build/db-4.2.52.NC/dbinc/mutex.h	Fri May 19 12:43:58 2006
++***************
++*** 781,786 ****
++--- 781,811 ----
++  #endif
++  #endif
++  
+++ /*********************************************************************
+++  * x86_64/gcc assembly.
+++  *********************************************************************/
+++ #ifdef HAVE_MUTEX_X86_64_GCC_ASSEMBLY
+++ typedef unsigned char tsl_t;
+++ 
+++ #ifdef LOAD_ACTUAL_MUTEX_CODE
+++ /*
+++  * For gcc/x86-64, 0 is clear, 1 is set.
+++  */
+++ #define	MUTEX_SET(tsl) ({						\
+++ 	register tsl_t *__l = (tsl);					\
+++ 	int __r;							\
+++ 	asm volatile("movq $1,%%rax; lock; xchgb %1,%%al; xorq $1,%%rax"\
+++ 	    : "=&a" (__r), "=m" (*__l)					\
+++ 	    : "1" (*__l)						\
+++ 	    );								\
+++ 	__r & 1;							\
+++ })
+++ 
+++ #define	MUTEX_UNSET(tsl)	(*(tsl) = 0)
+++ #define	MUTEX_INIT(tsl)		MUTEX_UNSET(tsl)
+++ #endif
+++ #endif
+++ 
++  /*
++   * Mutex alignment defaults to one byte.
++   *
diff --git a/editors/openoffice.org-3-RC/files/patch-psprint-i62535 b/editors/openoffice.org-3-RC/files/patch-psprint-i62535
deleted file mode 100644
index 17f958c1ce47..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-psprint-i62535
+++ /dev/null
@@ -1,65 +0,0 @@
---- config_office/configure	2006-02-24 23:17:16.000000000 +0100
-+++ config_office/configure	2006-02-25 08:53:26.000000000 +0100
-@@ -19833,13 +19833,13 @@
- echo "$as_me:$LINENO: checking whether to include PPDs" >&5
- echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6
- if test "$without_ppds" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-   WITHOUT_PPDS=YES
-   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
-+else
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- fi
- 
- 
-@@ -19847,13 +19847,13 @@
- echo "$as_me:$LINENO: checking whether to include AFMs" >&5
- echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6
- if test "$without_afms" = "yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--else
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
-   WITHOUT_AFMS=YES
-   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
-+else
-+  echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
- fi
- 
- 
---- config_office/configure.in	2006-02-24 23:17:16.000000000 +0100
-+++ config_office/configure.in	2006-02-25 08:52:23.000000000 +0100
-@@ -4172,22 +4172,22 @@
- 
- AC_MSG_CHECKING([whether to include PPDs])
- if test "$without_ppds" = "yes"; then
--  AC_MSG_RESULT([yes])
--else
-   AC_MSG_RESULT([no])
-   WITHOUT_PPDS=YES
-   SCPDEFS="$SCPDEFS -DWITHOUT_PPDS"
-+else
-+  AC_MSG_RESULT([yes])
- fi
- AC_SUBST(WITHOUT_PPDS)
- AC_SUBST(SCPDEFS)
- 
- AC_MSG_CHECKING([whether to include AFMs])
- if test "$without_afms" = "yes"; then
--  AC_MSG_RESULT([yes])
--else
-   AC_MSG_RESULT([no])
-   WITHOUT_AFMS=YES
-   SCPDEFS="$SCPDEFS -DWITHOUT_AFMS"
-+else
-+  AC_MSG_RESULT([yes])
- fi
- AC_SUBST(WITHOUT_AFMS)
- AC_SUBST(SCPDEFS)
diff --git a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk b/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk
deleted file mode 100644
index 2959319805b5..000000000000
--- a/editors/openoffice.org-3-RC/files/patch-rsc+source+rscpp+makefile.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-Issuetracker : #i54178#
-CWS          : hr17
-Author:      :
-Description  :
-
-Index: rsc/source/rscpp/makefile.mk
-===================================================================
-RCS file: /cvs/gsl/rsc/source/rscpp/makefile.mk,v
-retrieving revision 1.5
-diff -u -r1.5 makefile.mk
---- rsc/source/rscpp/makefile.mk	8 Sep 2005 14:00:27 -0000	1.5
-+++ rsc/source/rscpp/makefile.mk	21 Sep 2005 10:18:09 -0000
-@@ -36,6 +36,8 @@
- 
- TARGETTYPE=CUI
- TARGETTHREAD=ST
-+# we don't need STL in this project
-+NO_DEFAULT_STL=TRUE
- 
- PRJNAME=rsc
- TARGET=rscpp