author: Baptiste Daroussin <bapt@FreeBSD.org> 2012-04-22 20:38:32 +0000
committer: Baptiste Daroussin <bapt@FreeBSD.org> 2012-04-22 20:38:32 +0000
commit: 8269acc5cea14fd90a0997cd287caa5b4fa52638 (patch)
tree: 68434c0582718bc0b7d23867bb335c9e9d01f1ea /editors/libreoffice
parent: d25e12e5390827169c65739d195d68b0e220e1f3 (diff)
download: ports-8269acc5cea14fd90a0997cd287caa5b4fa52638.tar.gz
ports-8269acc5cea14fd90a0997cd287caa5b4fa52638.zip
33 files changed, 2901 insertions, 661 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index b8bcaaa2d161..0901906bc915 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -5,53 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libreoffice
-PORTVERSION=	3.4.5
-CATEGORIES=	editors
-MASTER_SITES=	http://ftp.rediris.es/mirror/TDF/libreoffice/src/${PORTVERSION}/ \
-		http://mirrors.supportex.net/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://mirror.netcologne.de/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/src/${PORTVERSION}/ \
-		http://artfiles.org/documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
-		http://mirror.galpon.org/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://tdf.panu.it/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.klid.dk/ftp/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://gd.tuwien.ac.at/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://archive.sunet.se/pub/Office/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.astral.ro/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.roedu.net/mirrors/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.unicamp.br/pub/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://mirror.yongbok.net/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
-		http://ftp.osuosl.org/pub/tdf/libreoffice/src/${PORTVERSION}/ \
-		http://dev-www.libreoffice.org/src/:ext \
+.include "${.CURDIR}/Makefile.common"
+
+MASTER_SITE_SUBDIR=	src/${PORTVERSION}/
+MASTER_SITES+=	http://dev-www.libreoffice.org/src/:ext \
 		http://download.go-oo.org/src/:GoOOSrc \
 		http://download.go-oo.org/extern/:GoOOExtern \
 		http://www.numbertext.org/linux/:OOoDTP
 
-MAINTAINER=	office@FreeBSD.org
 COMMENT=	Full integrated office productivity suite
 
-LICENSE=	LGPL3 MPL
-LICENSE_COMB=	dual
-
-# dmake can't be used from ports
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		gpatch:${PORTSDIR}/devel/patch \
 		unzip:${PORTSDIR}/archivers/unzip \
 		bash:${PORTSDIR}/shells/bash \
-		oo2po:${PORTSDIR}/textproc/translate-toolkit \
 		dmake:${PORTSDIR}/devel/dmake \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \
-		${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit \
-		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \
 		vigra-config:${PORTSDIR}/graphics/vigra
-# rely on bsdtar ability to extract .gz and .bz2 archives
+
+#		${LOCALBASE}/include/mdds/global.hpp:${PORTSDIR}/devel/mdds
+#		${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
+
 LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		xslt.2:${PORTSDIR}/textproc/libxslt \
@@ -67,50 +42,45 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		wpg-0.2.2:${PORTSDIR}/graphics/libwpg \
 		wps-0.2.2:${PORTSDIR}/textproc/libwps \
 		rdf.0:${PORTSDIR}/textproc/redland \
-		textcat.0:${PORTSDIR}/textproc/libtextcat \
+		exttextcat.0:${PORTSDIR}/textproc/libexttextcat \
 		lpsolve55:${PORTSDIR}/math/lp_solve \
-		cups.2:${PORTSDIR}/print/cups-client
+		cups.2:${PORTSDIR}/print/cups-client \
+		visio-0.0.0:${PORTSDIR}/textproc/libvisio \
+		graphite2.2:${PORTSDIR}/graphics/graphite2 \
+		nss3.1:${PORTSDIR}/security/nss \
+		SampleICC.2:${PORTSDIR}/graphics/sampleicc \
+		png.6:${PORTSDIR}/graphics/png \
+		cmis-0.2.0:${PORTSDIR}/net/libcmis \
+
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/liberation-fonts-ttf/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \
+		${LOCALBASE}/lib/X11/fonts/linuxlibertine/LinLibertine_Bd-4.1.0.ttf:${PORTSDIR}/x11-fonts/linuxlibertine \
+		${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans.ttf:${PORTSDIR}/x11-fonts/dejavu \
+		${LOCALBASE}/lib/X11/fonts/gentium-basic/GenBasI.ttf:${PORTSDIR}/x11-fonts/gentium-basic
 
 CONFLICTS_INSTALL=	libreoffice-legacy-[0-9]*
 
-LOVERSION=	${PORTVERSION}.2
-LO_COMPONENTS=	artwork base calc components extensions \
-		extras filters help impress libs-core libs-extern \
-		libs-extern-sys libs-gui postprocess sdk testing \
-		ure writer translations
+#LO_COMPONENTS=	binfilter dictionaries help translations
+LO_COMPONENTS=	help
 
-USE_BZIP2=	yes
+USE_XZ=	yes
+USE_PYTHON=	yes
 #l10n
 INSTALL_TARGET=	distro-pack-install
 
 DIST_SUBDIR=	libreoffice
-DISTFILES+=	${PORTNAME}-bootstrap-${LOVERSION}${EXTRACT_SUFX}
-WRKSRC=		${WRKDIR}/${PORTNAME}-bootstrap-${LOVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-core-${LOVERSION}
 
 LODESTDIR=	${WRKDIR}/loinstall
 
+DISTFILES+=	${PORTNAME}-core-${LOVERSION}${EXTRACT_SUFX}
 .for components in ${LO_COMPONENTS}
 DISTFILES+=	${PORTNAME}-${components}-${LOVERSION}${EXTRACT_SUFX}
 .endfor
 
-# for dynamic plist generation
-PLISTD?=	${WRKDIR}/plist_dirs
-PLISTF?=	${WRKDIR}/plist_files
-
-# not tested on other platforms and at leat plist will be wrong because of LOARCH not expendanded correctly
-ONLY_FOR_ARCH=	i386 amd64
-
 EXTRACT_ONLY:=	${DISTFILES}
 
-#additionnal components
-DISTFILES+=	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz:GoOOSrc \
-		067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz:GoOOSrc \
-		1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz:GoOOSrc \
-		0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2:GoOOSrc \
-		f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip:ext \
-		0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz:ext \
-		35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip:GoOOSrc \
-		881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip:OOoDTP
+DISTFILES+=	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2:ext \
+		f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2:ext
 
 USE_BDB=	yes
 USE_PERL5_BUILD=	yes
@@ -119,20 +89,24 @@ USE_GMAKE=	yes
 USE_BISON=	build
 USE_OPENSSL=	yes
 WANT_GNOME=	yes
+WANT_PGSQL_VER=	90+
+USE_PGSQL=	yes
+
 USE_XORG=	xaw xrandr
 USE_GL=		gl glu
 MAKE_JOBS_UNSAFE=	yes
-USE_AUTOTOOLS=	autoconf automake:env
+USE_GETTEXT=	yes
 
 OPTIONS=	WEBDAV	"Support webdav protocol" off \
 		KDE4	"With Qt4/KDE4 vclplug support" off \
 		GTK	"With GTK vclplug support" on \
+		GTK3	"With GTK3 vclplug support" off \
 		GNOME	"Better integration in gnome environnement" off \
 		JAVA	"Add Java support (XML Filters, macros)" off \
-		PYUNO	"Allow to script libreoffice in python" off \
-		SYSTRAY	"Enable systemtry quickstarter" off \
+		SYSTRAY	"Enable systemtray quickstarter" off \
 		MMEDIA	"Enable multimedia backend for impress" off \
 		SDK	"Build with SDK" off \
+		SVG	"Enable SVG support" on \
 		DEBUG	"Build with debug symbols and verbose output" off
 
 CONFIGURE_ENV=		GPERF=${LOCALBASE}/bin/gperf \
@@ -140,18 +114,18 @@ CONFIGURE_ENV=		GPERF=${LOCALBASE}/bin/gperf \
 			OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
 
+#			--with-system-boost
+#			--with-system-mdds
 CONFIGURE_ARGS+=	--with-unix-wrapper="libreoffice" \
 			--disable-fetch-external \
 			--with-build-version="FreeBSD ports ${PKGVERSION}" \
 			--with-vendor="FreeBSD ports ${PKGVERSION}" \
 			--exec-prefix=${PREFIX} \
-			--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch \
+			--with-external-tar=${DISTDIR}/${DIST_SUBDIR} \
 			--with-system-libxml \
-			--with-system-libxslt \
-			--with-system-cairo --enable-cairo \
-			--with-system-boost \
-			--with-system-cppunit \
+			--with-system-cairo \
+			--enable-cairo-canvas \
 			--with-system-zlib \
 			--with-system-icu \
 			--with-system-db \
@@ -159,6 +133,7 @@ CONFIGURE_ARGS+=	--with-unix-wrapper="libreoffice" \
 			--with-system-expat \
 			--with-system-openssl \
 			--with-system-curl \
+			--with-system-libvisio \
 			--with-system-libwpd \
 			--with-system-libwpg \
 			--with-system-libwps \
@@ -167,33 +142,45 @@ CONFIGURE_ARGS+=	--with-unix-wrapper="libreoffice" \
 			--with-system-hunspell \
 			--with-system-mythes \
 			--with-system-altlinuxhyph \
-			--with-system-libtextcat \
+			--with-system-libexttextcat \
 			--with-system-lpsolve \
 			--with-system-vigra \
-			--with-fonts \
 			--with-alloc=system \
 			--with-system-stdlibs \
-			--with-system-xrender-headers \
 			--with-system-mesa-headers \
 			--disable-epm \
 			--disable-mozilla \
 			--disable-build-mozilla \
 			--without-system-mozilla \
-			--disable-kde \
+			--without-fonts \
+			--without-afms \
+			--without-ppds \
 			--without-stlport \
-			--disable-nss-module \
-			--with-system-translate-toolkit \
+			--disable-kde \
+			--disable-kdeab \
+			--with-system-nss \
+			--without-myspell-dicts \
 			--with-system-dicts \
 			--disable-dependency-tracking \
 			--with-external-thes-dir=${LOCALBASE}/share/mythes \
 			--with-external-hyph-dir=${LOCALBASE}/share/hyphen \
 			--with-external-dict-dir=${LOCALBASE}/share/hunspell \
 			--disable-zenity \
-			--enable-cups
-
-.if defined(LOCALIZED_LANG)
-CONFIGURE_ARGS+=	--with-lang="${LOCALIZED_LANG}"
-.endif
+			--enable-graphite \
+			--with-system-graphite \
+			--with-system-sampleicc \
+			--enable-mergelibs \
+			--enable-gio  \
+			--disable-nsplugin \
+			--disable-linkoo \
+			--disable-online-update \
+			--disable-xmlsec \
+			--with-system-gettext \
+			--with-system-libpng \
+			--with-system-postgresql \
+			--with-system-libcmis \
+			--disable-gnome-vfs \
+			--enable-python=system
 
 # extensions
 CONFIGURE_ARGS+=	--enable-ext-pdfimport \
@@ -219,9 +206,27 @@ MANCOMPRESSED=	yes
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_GCC)
+USE_GCC=	4.6+
+DISTFILES+=	bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz:ext
+.else
+CONFIGURE_ARGS+=	--with-system-cppunit
+CC=	clang
+CXX=	clang++
+CXXCPP=	clang-cpp
+CPP=	clang-cpp
+.if !exists(${DESTDIR}/usr/bin/clang)
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang:${PORTSDIR}/lang/clang
+USE_BINUTILS=	yes
+CXXCPP=	clang++ -E
+CPP=	clang -E
+.endif
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcppunit.so:${PORTSDIR}/devel/cppunit
+.endif
+
 MAKE_ENV+=	USE_GMAKE=1 DESTDIR=${LODESTDIR}
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER} -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/db${BDB_VER}
 
 .if defined(WITHOUT_SYSTRAY)
 CONFIGURE_ARGS+=	--disable-systray
@@ -233,20 +238,27 @@ USE_GSTREAMER=	yes
 CONFIGURE_ARGS+=	--disable-gstreamer
 .endif
 
-.if defined(WITH_PYUNO)
-USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-system-python
+.if defined(WITH_SVG)
+CONFIGURE_ARGS+=	--enable-librsvg=system
+USE_GNOME+=	librsvg2
 .else
-CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--enable-librsvg=no
 .endif
 
 .if defined(WITH_GTK) || defined(WITH_GNOME)
-USE_GNOME=	gtk20 desktopfileutils
+USE_GNOME+=	gtk20 desktopfileutils
 INSTALLS_ICONS=	yes
 .else
 CONFIGURE_ARGS+=	--disable-gtk
 .endif
 
+.if defined(WITH_GTK3)
+USE_GNOME+=	gtk30 desktopfileutils
+INSTALLS_ICONS=	yes
+.else
+CONFIGURE_ARGS+=	--disable-gtk3
+.endif
+
 .if defined(WITH_WEBDAV)
 CONFIGURE_ARGS+=	--enable-neon --with-system-neon
 LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
@@ -264,10 +276,10 @@ CONFIGURE_ARGS+=	--disable-kde4
 .endif
 
 .if defined(WITH_GNOME)
-USE_GNOME+=		gconf2 gnomevfs2
-CONFIGURE_ARGS+=	--enable-gconf --enable-gnome-vfs
+USE_GNOME+=		gconf2
+CONFIGURE_ARGS+=	--enable-gconf
 .else
-CONFIGURE_ARGS+=	--disable-gconf --disable-gnome-vfs
+CONFIGURE_ARGS+=	--disable-gconf --disable-lockdown
 .endif
 
 .if defined(WITH_JAVA)
@@ -334,24 +346,11 @@ CONFIGURE_ARGS+=	--enable-debug \
 			--enable-dbgutil \
 			--enable-verbose \
 			--enable-crashdump
+.else
+CONFIGURE_ARGS+=	--enable-release-build
 .endif
 
 .include <bsd.port.pre.mk>
-pre-fetch:
-.if !defined(LOCALIZED_LANG)
-	@${ECHO_CMD}
-	@${ECHO_CMD} "you can build a localized version of libreoffice by setting"
-	@${ECHO_CMD} "LOCALIZED_LANG=xx"
-	@${ECHO_CMD} "where xx can one or more of the following:"
-	@${ECHO_CMD} "af ar as ast be-BY bg bn bo br brx bs ca-XV ca cs cy da de dgo dz el"
-	@${ECHO_CMD} "en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi-IN hi hr hu id is it"
-	@${ECHO_CMD} "ja ka kid kk km kn ko kok ks ku lo lt lv mai mk ml mn mni mr my nb ne"
-	@${ECHO_CMD} "nl nn nr ns oc om or pa-IN pl pt-BR pt ro ru rw sa-IN sat sd sh si sk"
-	@${ECHO_CMD} "sl sq sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur-IN uz ve vi xh"
-	@${ECHO_CMD} "zh-CN zh-TW zu"
-	@${ECHO_CMD}
-	@${ECHO_CMD} "Current setting: ${LOCALIZED_LANG}"
-.endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/clone
@@ -362,25 +361,36 @@ post-extract:
 	@${TOUCH} ${WRKSRC}/clone/repos_changed
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#-5.1#${BDB_VER}#g' \
-		-e 's#5.1#${BDB_LIB_NAME:S/db//}#g' \
-			${WRKSRC}/configure.in
-	@${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#' \
-			${WRKSRC}/bin/distro-install-desktop-integration
-
-.if defined(WITH_KDE4)
-	@${REINPLACE_CMD} -e 's#moc,#moc-qt4,#g' \
-		${WRKSRC}/configure.in
+	@${REINPLACE_CMD} -e 's#5.1 5.0#${BDB_VER}#g' \
+		 -e 's,"Linux" \&\& test "z$$enable_graphite","FreeBSD" \&\& test "z$$enable_graphite",g' \
+		${WRKSRC}/configure
+#install-gdb-printer is failing
+	@${REINPLACE_CMD} -e "/gdb/d" ${WRKSRC}/solenv/prj/build.lst
+	@${REINPLACE_CMD} -e 's#@SYSTEM_DB_CFLAGS@#@SYSTEM_DB_CFLAGS@ -I${BDB_INCLUDE_DIR}#' \
+			-e 's#@DB_LIB@#${BDB_LIB_NAME}#' \
+			${WRKSRC}/set_soenv.in
+	@${REINPLACE_CMD} -e 's/sha1sum/sha1/g' ${WRKSRC}/configure
+.if defined(WITH_GCC)
+	@${REINPLACE_CMD} -e "s|^LINKFLAGSDEFS:=|LINKFLAGSDEFS:=-Wl,-rpath=${LOCALBASE}/lib/${_GCC_BUILD_DEPENDS}|" \
+		${WRKSRC}/solenv/inc/unxfbsd.mk
+.else
+	#Visibility is broken with clang
+	@${REINPLACE_CMD} -e "s|HAVE_GCC_VISIBILITY_FEATURE=TRUE|HAVE_GCC_VISIBILITY_FEATURE=FALSE|g" \
+		${WRKSRC}/configure
+		
 .endif
-#	@${LN} -s ${MD5} ${WRKSRC}/bin/md5sum
+
 .if defined(WITH_JAVA)
 	@${REINPLACE_CMD} -e 's/^ANT_OPT/#ANT_OPT/g' \
-		${WRKSRC}/clone/extensions/apache-commons/java/codec/makefile.mk \
-		${WRKSRC}/clone/extensions/apache-commons/java/httpclient/makefile.mk \
-		${WRKSRC}/clone/extensions/apache-commons/java/lang/makefile.mk \
-		${WRKSRC}/clone/extensions/apache-commons/java/logging/makefile.mk
+		${WRKSRC}/apache-commons/java/codec/makefile.mk \
+		${WRKSRC}/apache-commons/java/httpclient/makefile.mk \
+		${WRKSRC}/apache-commons/java/lang/makefile.mk \
+		${WRKSRC}/apache-commons/java/logging/makefile.mk
 .endif
 
+pre-configure:
+	@${TOUCH} ${WRKSRC}/autogen.lastrun
+
 post-configure:
 	@cd ${WRKSRC} && ./bin/create_bootstrap_links
 	@${TOUCH} ${WRKSRC}/src.downloaded
@@ -393,7 +403,7 @@ post-install:
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s lib \( -type f -o -type l \) -print >> ${PLISTF}
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -d lib/libreoffice -type d -exec ${ECHO_CMD} "@dirrm {}" \; >> ${PLISTD}
 
-.for subdir in applications icons mime mimelnk
+.for subdir in icons mimelnk
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND}  -H -s share/${subdir} \( -type f -o -type l \) -print >> ${PLISTF}
 	@cd ${LODESTDIR}/${PREFIX}/ && ${FIND} -d share/${subdir} -type d \
 		-exec ${ECHO_CMD} "@unexec ${RMDIR} %D/{}  2>/dev/null || ${TRUE}" \; >> ${PLISTD}
@@ -406,11 +416,7 @@ post-install:
 .endfor
 	@cd ${LODESTDIR}/${PREFIX} && ${FIND} -H -s bin \( -type f -o -type l \) -print >> ${PLISTF}
 
-#Fix .desktop files
-	@${FIND} ${LODESTDIR}/${PREFIX} -name *.desktop -type f -exec ${SED} -i .bak -e 's|office34|office|g; s|office3.4|office|g' {} \;
-	@${FIND} ${LODESTDIR}/${PREFIX} -name *.desktop.bak -delete
-
-.if defined(WITH_GTK) || defined(WITH_GNOME)
+.if defined(WITH_GTK) || defined(WITH_GNOME) || defined(WITH_GTK3)
 	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${TMPPLIST}
 .endif
@@ -422,8 +428,8 @@ post-install:
 .endfor
 .endif
 
-	@${SORT} ${WRKDIR}/plist_files >> ${TMPPLIST}
-	@${SORT} -r ${WRKDIR}/plist_dirs >> ${TMPPLIST}
+	@${SORT} ${PLISTF} >> ${TMPPLIST}
+	@${SORT} -r ${PLISTD} >> ${TMPPLIST}
 
 .if defined(WITH_SDK)
 .for subdir in include share/idl share/libreoffice share/doc
diff --git a/editors/libreoffice/Makefile.common b/editors/libreoffice/Makefile.common
new file mode 100644
index 000000000000..b4f56ff115fe
--- /dev/null
+++ b/editors/libreoffice/Makefile.common
@@ -0,0 +1,79 @@
+# $FreeBSD$
+
+PORTNAME=	libreoffice
+PORTVERSION=	3.5.2
+RCVER=		2
+LOVERSION=	${PORTVERSION}.${RCVER}
+CATEGORIES?=	editors
+MAINTAINER?=	office@FreeBSD.org
+
+LICENSE=	LGPL3 MPL
+LICENSE_COMB=	dual
+
+MASTER_SITES?=	http://ftp.rediris.es/mirror/TDF/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirrors.supportex.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirror.netcologne.de/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirror.informatik.uni-mannheim.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.uni-muenster.de/pub/software/DocumentFoundation/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.rz.tu-bs.de/pub/mirror/tdf/tdf-pub/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://artfiles.org/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirror.galpon.org/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.tu-chemnitz.de/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://tdf.panu.it/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.wh2.tu-dresden.de/pub/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.klid.dk/ftp/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://gd.tuwien.ac.at/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://archive.sunet.se/pub/Office/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.astral.ro/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.roedu.net/mirrors/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.unicamp.br/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirror.yongbok.net/tdf/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://mirror3.mirrors.tds.net/pub/documentfoundation.org/libreoffice/${MASTER_SITE_SUBDIR} \
+		http://ftp.osuosl.org/pub/tdf/libreoffice/${MASTER_SITE_SUBDIR}
+
+ONLY_FOR_ARCH=	i386 amd64
+
+# for dynamic plist generation
+PLISTD?=	${WRKDIR}/plist_dirs
+PLISTF?=	${WRKDIR}/plist_files
+
+.if defined(LO_I18N)
+NO_BUILD=	yes
+
+RUN_DEPENDS=	libreoffice:${PORTSDIR}/editors/libreoffice
+
+#MASTER_SITE_SUBDIR=	testing/${PORTVERSION}/deb/x86/
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/deb/x86/
+DIST_SUBDIR?=	libreoffice/i18n
+
+PKGNAMEPREFIX=	${LO_I18N}-
+
+DISTFILES=	LibO_${PORTVERSION}_Linux_x86_langpack-deb_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
+.if defined(LO_HAS_HELPPACK)
+DISTFILES+=	LibO_${PORTVERSION}_Linux_x86_helppack-deb_${LO_I18N:S/_/-/}${EXTRACT_SUFX}
+.endif
+COMMENT?=	${LO_I18N} language pack for ${PORTNAME}
+
+post-extract:
+	@${MKDIR} ${WRKSRC}; \
+	for deb in ${WRKDIR}/LibO_${PORTVERSION}rc${RCVER}_Linux_x86_langpack-deb_${LO_I18N:S/_/-/}/DEBS/*.deb ; do \
+		${TAR} xfO $${deb} data.tar.gz | ${TAR} -C ${WRKSRC} -xf - ; \
+	done ; \
+	if [ -n ${LO_HAS_HELPPACK} ]; then \
+		for deb in ${WRKDIR}/LibO_${PORTVERSION}rc${RCVER}_Linux_x86_helppack-deb_${LO_I18N:S/_/-/}/DEBS/*.deb ; do \
+			${TAR} xfO $${deb} data.tar.gz | ${TAR} -C ${WRKSRC} -xf - ; \
+		done ; \
+	fi
+
+do-install:
+	@rm -f ${PLISTD} ${PLISTF}
+	cd ${WRKSRC}/opt/${PORTNAME}3.5 ; ${FIND} * -type d -exec ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/${PORTNAME}/{} || ${TRUE}" \; >> ${PLISTD}
+	cd ${WRKSRC}/opt/${PORTNAME}3.5 ; ${FIND} * \( -type f -o -type l \) -exec ${ECHO_CMD} "lib/${PORTNAME}/{} " \; >> ${PLISTF}
+
+	${SORT} ${PLISTF} >> ${TMPPLIST}
+	${SORT} -r ${PLISTD} >> ${TMPPLIST}
+
+	${MKDIR} ${PREFIX}/lib/${PORTNAME}
+	cd ${WRKSRC}/opt/${PORTNAME}3.5 ; ${PAX} -rw . ${PREFIX}/lib/${PORTNAME}
+
+.endif
diff --git a/editors/libreoffice/distinfo b/editors/libreoffice/distinfo
index daebdbd21cca..0671318f3fcd 100644
--- a/editors/libreoffice/distinfo
+++ b/editors/libreoffice/distinfo
@@ -1,59 +1,13 @@
-SHA256 (libreoffice/libreoffice-bootstrap-3.4.5.2.tar.bz2) = a9a3f223046d57002f0b76b0c04c07398a77bbc85acb445faea6e6d6a637bf17
-SIZE (libreoffice/libreoffice-bootstrap-3.4.5.2.tar.bz2) = 2715464
-SHA256 (libreoffice/libreoffice-artwork-3.4.5.2.tar.bz2) = 382c746c92988041010d521fd5969c013ff8b31233900062dff729c0a50d7107
-SIZE (libreoffice/libreoffice-artwork-3.4.5.2.tar.bz2) = 13537659
-SHA256 (libreoffice/libreoffice-base-3.4.5.2.tar.bz2) = 9f9b7ae788a8249ccbcaca0ba2155cd91f76367cbaf3e1ad063f8e61b3d7b938
-SIZE (libreoffice/libreoffice-base-3.4.5.2.tar.bz2) = 2070005
-SHA256 (libreoffice/libreoffice-calc-3.4.5.2.tar.bz2) = 31f94e9cfca6edc17e62d822349ed5bda8fed93af83c5c651835e92031f000d0
-SIZE (libreoffice/libreoffice-calc-3.4.5.2.tar.bz2) = 9519567
-SHA256 (libreoffice/libreoffice-components-3.4.5.2.tar.bz2) = a2c0f819ca06c6fd82645920cdfb5c614dadcbd934a11864e706806e00f506eb
-SIZE (libreoffice/libreoffice-components-3.4.5.2.tar.bz2) = 5089571
-SHA256 (libreoffice/libreoffice-extensions-3.4.5.2.tar.bz2) = ff6c6bbc78e21277a10fdf3e3feddb425368621f7aa2fd288738d19d609ab0a3
-SIZE (libreoffice/libreoffice-extensions-3.4.5.2.tar.bz2) = 4219897
-SHA256 (libreoffice/libreoffice-extras-3.4.5.2.tar.bz2) = 5b225c6efa62c3f4b929def8345e9dc3b8a72a48e885a89593f743a32c18b57f
-SIZE (libreoffice/libreoffice-extras-3.4.5.2.tar.bz2) = 38643665
-SHA256 (libreoffice/libreoffice-filters-3.4.5.2.tar.bz2) = 86d075b12f55c44fcd42e8ee8579da886feb887a2660953503a3a4b115ee5800
-SIZE (libreoffice/libreoffice-filters-3.4.5.2.tar.bz2) = 11780568
-SHA256 (libreoffice/libreoffice-help-3.4.5.2.tar.bz2) = 186b9cc154d19f600ea314f37ffebd00922e69c07818aea5f0bab671fec7faa9
-SIZE (libreoffice/libreoffice-help-3.4.5.2.tar.bz2) = 1845841
-SHA256 (libreoffice/libreoffice-impress-3.4.5.2.tar.bz2) = 0391df3e70b947804a0cdbb638ab61f09a934ac58f7c90a972b31dca495f6a47
-SIZE (libreoffice/libreoffice-impress-3.4.5.2.tar.bz2) = 2651854
-SHA256 (libreoffice/libreoffice-libs-core-3.4.5.2.tar.bz2) = 8bec5d81989bb9fe5d9e88252666d91c106b6ac334cb3c638f31140751699c2e
-SIZE (libreoffice/libreoffice-libs-core-3.4.5.2.tar.bz2) = 15596849
-SHA256 (libreoffice/libreoffice-libs-extern-3.4.5.2.tar.bz2) = 7ae02ea50b8b8325778e01633c2d148a074f05ad5f4713d13a0a01e9a41b9505
-SIZE (libreoffice/libreoffice-libs-extern-3.4.5.2.tar.bz2) = 638269
-SHA256 (libreoffice/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2) = 0052c8879f61404725e05cc22782984adb69328f1f6ff75384ed426aabb14894
-SIZE (libreoffice/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2) = 40048456
-SHA256 (libreoffice/libreoffice-libs-gui-3.4.5.2.tar.bz2) = 99c18b9b9e7ff3ac99cd918dd238e9874781b432bc19d279766b4a2fa2463672
-SIZE (libreoffice/libreoffice-libs-gui-3.4.5.2.tar.bz2) = 10866264
-SHA256 (libreoffice/libreoffice-postprocess-3.4.5.2.tar.bz2) = d7badba4b2c5bdc93b4aab62232c027c9f60f9e2a7a1ee5a1e72bbdc82c757e7
-SIZE (libreoffice/libreoffice-postprocess-3.4.5.2.tar.bz2) = 50952
-SHA256 (libreoffice/libreoffice-sdk-3.4.5.2.tar.bz2) = fce5074dee1c50f3f93886caac62c2f711d17798b110fa088b3a71550eda31b9
-SIZE (libreoffice/libreoffice-sdk-3.4.5.2.tar.bz2) = 1720970
-SHA256 (libreoffice/libreoffice-testing-3.4.5.2.tar.bz2) = 18290afb6de88243fbe198c0bae7dcbac2ac4e1459332bc4d9b23e59221d5317
-SIZE (libreoffice/libreoffice-testing-3.4.5.2.tar.bz2) = 50846799
-SHA256 (libreoffice/libreoffice-ure-3.4.5.2.tar.bz2) = fe5780496381255bf330d53ddc0d7fcf76ade5ec0f2bd5d5c7d60facd633e071
-SIZE (libreoffice/libreoffice-ure-3.4.5.2.tar.bz2) = 6215972
-SHA256 (libreoffice/libreoffice-writer-3.4.5.2.tar.bz2) = b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
-SIZE (libreoffice/libreoffice-writer-3.4.5.2.tar.bz2) = 7299202
-SHA256 (libreoffice/libreoffice-translations-3.4.5.2.tar.bz2) = 3f864306f6c19aff405ecfeaf92280dbb344249d9771bdfc43051a3c75b6fe59
-SIZE (libreoffice/libreoffice-translations-3.4.5.2.tar.bz2) = 137836367
-SHA256 (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
-SIZE (libreoffice/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz) = 547217
-SHA256 (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 9d29cba4312812a26b14effda2cf56284e70226cdccc90a83844297e3b7498ee
-SIZE (libreoffice/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz) = 4893724
-SHA256 (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b
-SIZE (libreoffice/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz) = 315122
+SHA256 (libreoffice/libreoffice-core-3.5.2.2.tar.xz) = df681145f7f1dda30e3f82d4924722957662d744df0e7b6fa024b2bd53fb3dc6
+SIZE (libreoffice/libreoffice-core-3.5.2.2.tar.xz) = 103296172
+SHA256 (libreoffice/libreoffice-help-3.5.2.2.tar.xz) = eed36c9af340c4f6fd561c4524ca831c85352a4602f6e48aaccb66e53825ce51
+SIZE (libreoffice/libreoffice-help-3.5.2.2.tar.xz) = 1857620
 SHA256 (libreoffice/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2) = a19205ac076973b55d9c5d3c8b664735d5b89fe793629ec10c110caa98e0bc1d
 SIZE (libreoffice/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2) = 92050
-SHA256 (libreoffice/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip) = 6239dd042f33c0dbbccce94e20232135c9e18a3a5d8e5227285a5806fd5ea11f
-SIZE (libreoffice/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip) = 5008644
-SHA256 (libreoffice/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz) = de646f7dc38ce0941247ba694a1a8372e0b7c2d79478e1ec83b67ac8d0e92d48
-SIZE (libreoffice/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz) = 1326668
-SHA256 (libreoffice/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip) = f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b
-SIZE (libreoffice/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip) = 867405
-SHA256 (libreoffice/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip) = 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
-SIZE (libreoffice/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip) = 4001063
+SHA256 (libreoffice/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) = 45c328029d97d1f1dc7ff8c9527cd0c5cc356636084a800bca2ee4bfab1978db
+SIZE (libreoffice/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2) = 38806420
+SHA256 (libreoffice/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz) = ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
+SIZE (libreoffice/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz) = 762803
 SHA256 (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
 SIZE (libreoffice/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip) = 1521926
 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
diff --git a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
index 362c239844a4..dcf5c8bf24ec 100644
--- a/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
+++ b/editors/libreoffice/files/patch-bin__distro-install-desktop-integration
@@ -1,11 +1,6 @@
---- bin/distro-install-desktop-integration.orig	2011-08-15 19:46:21.000000000 +0200
-+++ bin/distro-install-desktop-integration	2011-09-09 16:00:15.645182583 +0200
-@@ -74,21 +74,21 @@
-     test -n "$oowrapper_name" && create_man_link "$oowrapper_name" "$used_man_page" "$file_list"
-     
-     # add desktop file to the right file list
--    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "/usr/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
-+    test -n "$desktop_file" -a -f "$DESTDIR/$file_list" && echo "$PREFIXDIR/share/applications/$desktop_file" >>"$DESTDIR/$file_list"
+--- bin/distro-install-desktop-integration.orig	2012-04-18 17:18:32.000000000 +0200
++++ bin/distro-install-desktop-integration	2012-04-20 14:35:47.000000000 +0200
+@@ -91,13 +91,13 @@
  }
  
  # install desktop integration from plain packages
@@ -18,73 +13,43 @@
  cd $sysui_temp
  # we want non-versioned stuff in the distro packages
 -sed -i \
--    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
--    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
--    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
--    *
-+#sed -i \
-+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-+#    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-+#    *
- # call in subshell to do not malfrom PRODUCTVERSION, ...
- (
-     export OFFICE_PREFIX=$LIBDIR
-@@ -96,8 +96,8 @@
-     export ICON_PREFIX=$INSTALLDIRNAME
-     export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons
-     export PRODUCTVERSION=
--    export KDEMAINDIR=/usr
--    export GNOMEDIR=/usr
-+    export KDEMAINDIR=$PREFIXDIR
-+    export GNOMEDIR=$PREFIXDIR
++sed -i "" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+     -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+@@ -112,15 +112,15 @@
+     export KDEMAINDIR=$PREFIXDIR
+     export GNOMEDIR=$PREFIXDIR
      export GNOME_MIME_THEME=hicolor
-     /bin/bash ./create_tree.sh
+-    /bin/bash ./create_tree.sh
++    bash ./create_tree.sh
  )
-@@ -106,32 +106,32 @@
+ cd -
+ rm -rf $sysui_temp
  
  # we do not want some stuff from the plain packages
- rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME*
--rm -f $DESTDIR/usr/share/applications/libreoffice-javafilter.desktop
--rm -f $DESTDIR/usr/share/applications/libreoffice-printeradmin.desktop
+ rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin
+-rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop
+-rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop
 +rm -f $DESTDIR/$PREFIXDIR/share/applications/libreoffice-javafilter.desktop
 +rm -f $DESTDIR/$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop
- if test -d $DESTDIR/opt ; then 
+ if test -d $DESTDIR/opt ; then
      rm -f $DESTDIR/opt/$INSTALLDIRNAME
      rmdir --ignore-fail-on-non-empty $DESTDIR/opt
- fi
- 
+@@ -129,7 +129,7 @@
  # we want non-versioned desktop files
--cd $DESTDIR/$INSTALLDIR/share/xdg
-+#cd $DESTDIR/$INSTALLDIR/share/xdg
+ cd $DESTDIR/$INSTALLDIR/share/xdg
  # we want non-versioned stuff in the distro packages
 -sed -i \
--    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
--    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
--    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
--    *.desktop
--cd -
-+#sed -i \
-+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
-+#    -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
-+#    -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
-+#    *.desktop
-+#cd -
- 
- # put the stuff installed by create_tree.sh into the right file lists
- # desktop files will be added by the corresponding add_wrapper command
- if test -f $DESTDIR/gid_Module_Root_Brand ; then
--    for dir in /usr/share/application-registry \
--               /usr/share/mimelnk/application \
--               /usr/share/mime/packages \
--               /usr/share/mime-info \
--               /usr/share/icons ; do
++sed -i "" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \
+     -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \
+     -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \
+@@ -144,7 +144,7 @@
+                $PREFIXDIR/share/mime/packages \
+                $PREFIXDIR/share/mime-info \
+                $PREFIXDIR/share/icons ; do
 -        find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand
-+    for dir in $PREFIXDIR/share/application-registry \
-+               $PREFIXDIR/share/mimelnk/application \
-+               $PREFIXDIR/share/mime/packages \
-+               $PREFIXDIR/share/mime-info \
-+               $PREFIXDIR/share/icons ; do
 +        find "$DESTDIR$dir" \( -type f -o -type l \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand
      done
  fi
diff --git a/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx b/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx
deleted file mode 100644
index c55dfbad2a5c..000000000000
--- a/editors/libreoffice/files/patch-clone__components__automation__source__testtool__objtest.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
---- clone/components/automation/source/testtool/objtest.cxx.orig	2011-05-20 18:05:11.000000000 +0200
-+++ clone/components/automation/source/testtool/objtest.cxx	2011-08-25 22:36:33.395644903 +0200
-@@ -433,8 +433,10 @@
-     abGP.Append( "04" );
- #elif defined SOLARIS && defined INTEL
-     abGP.Append( "05" );  // Solaris x86
--#elif defined FREEBSD
-+#elif defined FREEBSD && defined INTEL
-     abGP.Append( "08" );
-+#elif defined FREEBSD && defined X86_64
-+    abGP.Append( "09" );
- #elif defined MACOSX
-     abGP.Append( "12" );
- #elif defined LINUX && defined PPC
diff --git a/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk b/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk
deleted file mode 100644
index afeb83c81bd6..000000000000
--- a/editors/libreoffice/files/patch-clone__filters__oox__source__token__makefile.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- clone/filters/oox/source/token/makefile.mk.orig	2011-05-20 16:05:36.000000000 +0000
-+++ clone/filters/oox/source/token/makefile.mk	2011-08-24 21:15:27.302581359 +0000
-@@ -56,7 +56,7 @@ $(MISC)$/tokenhash.gperf $(INCCOM)$/toke
- $(SLO)$/tokenmap.obj : $(INCCOM)$/tokenhash.inc $(INCCOM)$/tokennames.inc $(GENHEADERPATH)$/tokens.hxx $(MISC)$/do_tokens
- 
- $(INCCOM)$/tokenhash.inc : $(MISC)$/tokenhash.gperf $(MISC)$/do_tokens
--    $(AUGMENT_LIBRARY_PATH) gperf --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
-+    $(AUGMENT_LIBRARY_PATH) $(GPERF) --compare-strncmp $(MISC)$/tokenhash.gperf | $(SED) -e "s/(char\*)0/(char\*)0, 0/g" | $(GREP) -v "^#line" >$(INCCOM)$/tokenhash.inc
- 
- $(MISC)$/do_tokens $(do_phony) : tokens.txt tokens.pl tokens.hxx.head tokens.hxx.tail $(GENHEADERPATH)$/tokens.hxx $(INCCOM)$/tokennames.inc $(MISC)$/tokenhash.gperf
-     @@-$(RM) $@
diff --git a/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh b/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh
deleted file mode 100644
index 9bca31ffad52..000000000000
--- a/editors/libreoffice/files/patch-clone__libs-core__sysui__desktop__share__create_tree.sh
+++ /dev/null
@@ -1,45 +0,0 @@
---- clone/libs-core/sysui/desktop/share/create_tree.sh.orig	2011-08-15 20:34:57.000000000 +0200
-+++ clone/libs-core/sysui/desktop/share/create_tree.sh	2011-09-05 16:44:54.715256916 +0200
-@@ -41,31 +41,31 @@
-   chmod 0644 ${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}.*
- fi
- 
--mkdir -p ${DESTDIR}/usr/bin
-+mkdir -p ${DESTDIR}${PREFIXDIR}/bin
- 
- test -n "$OFFICE_PREFIX" && office_prefix="$OFFICE_PREFIX" || office_prefix=/opt
- office_root=${office_prefix}/${PREFIX}
- 
- #this symlink is needed to have the API boostrap functions running right
--ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/${PREFIX}
-+ln -sf ${office_root}/program/soffice ${DESTDIR}${PREFIXDIR}/bin/${PREFIX}
- 
--cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
--chmod 0755 ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
-+cp printeradmin.sh ${DESTDIR}${PREFIXDIR}/bin/${PREFIX}-printeradmin
-+chmod 0755 ${DESTDIR}${PREFIXDIR}/bin/${PREFIX} ${DESTDIR}${PREFIXDIR}/bin/${PREFIX}-printeradmin
- 
- if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
-     # compat symlinks
-     mkdir -p ${DESTDIR}${office_prefix}
-     ln -sf libreoffice${PRODUCTVERSION} ${DESTDIR}${office_root}
--    ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}
--    ln -sf /usr/bin/${PREFIX}-printeradmin ${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin
-+    ln -sf ${PREFIXDIR}/bin/${PREFIX} ${DESTDIR}${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}
-+    ln -sf ${PREFIXDIR}/bin/${PREFIX}-printeradmin ${DESTDIR}${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}-printeradmin
- fi
- 
--mkdir -p ${DESTDIR}/usr/share/mime/packages
--cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
--chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
-+mkdir -p ${DESTDIR}${PREFIXDIR}/share/mime/packages
-+cp openoffice.org.xml ${DESTDIR}${PREFIXDIR}/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
-+chmod 0644 ${DESTDIR}${PREFIXDIR}/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
- 
--mkdir -p ${DESTDIR}/usr/share/applications
-+mkdir -p ${DESTDIR}${PREFIXDIR}/share/applications
- for i in `cat launcherlist`; do
--  ln -sf ${office_root}/share/xdg/$i ${DESTDIR}/usr/share/applications/${PREFIX}-$i
-+  ln -sf ${office_root}/share/xdg/$i ${DESTDIR}${PREFIXDIR}/share/applications/${PREFIX}-$i
- done
- 
diff --git a/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h b/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h
deleted file mode 100644
index 090f17a30ac9..000000000000
--- a/editors/libreoffice/files/patch-clone_libs-gui__tools__inc__solar.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- clone/libs-gui/tools/inc/tools/solar.h.orig	2011-08-25 22:53:01.311106000 +0200
-+++ clone/libs-gui/tools/inc/tools/solar.h	2011-08-25 22:53:36.335015661 +0200
-@@ -267,10 +267,8 @@
-   #define __DLLEXTENSION "lh.so"
- #elif defined LINUX && defined AXP
-   #define __DLLEXTENSION "ll.so"
--#elif defined FREEBSD && defined X86
--  #define __DLLEXTENSION "fi.so"
--#elif defined FREEBSD && defined X86_64
--  #define __DLLEXTENSION "fx.so"
-+#elif defined FREEBSD
-+  #define __DLLEXTENSION "fb.so"
- #elif defined MACOSX && defined POWERPC
-   #define __DLLEXTENSION "mxp.dylib"
- #elif defined MACOSX && defined X86
diff --git a/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h b/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h
deleted file mode 100644
index 9ec7f904f6d0..000000000000
--- a/editors/libreoffice/files/patch-clone_ure_sal_inc_sal_main.h
+++ /dev/null
@@ -1,50 +0,0 @@
---- clone/ure/sal/inc/sal/main.h.orig	2011-05-19 11:22:58.000000000 +0000
-+++ clone/ure/sal/inc/sal/main.h	2011-08-24 21:15:27.305581455 +0000
-@@ -30,8 +30,11 @@
- #define _SAL_MAIN_H_
- 
- #include <sal/types.h>
--#if defined(AIX)
-+#if defined(AIX) || defined(FREEBSD)
- #   include <unistd.h>
-+//*Hurl*, *Puke*, temp fix only, will
-+//cause other weirdness eventually
-+#  define BROKEN_SHUTDOWN
- #endif
- 
- #ifdef __cplusplus
-@@ -41,6 +44,16 @@ extern "C" {
- void SAL_CALL sal_detail_initialize(int argc, char ** argv);
- void SAL_CALL sal_detail_deinitialize();
- 
-+/**
-+ * TODO(gliaskos): Use this hack for now but we should remove it eventually.
-+ * ctx: http://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg04427.html 
-+ */
-+#ifdef BROKEN_SHUTDOWN
-+#  define MAINRET(x) _exit(x)
-+#else
-+#  define MAINRET(x) return x
-+#endif
-+
- #define SAL_MAIN_WITH_ARGS_IMPL \
- int SAL_CALL main(int argc, char ** argv) \
- { \
-@@ -48,7 +61,7 @@ int SAL_CALL main(int argc, char ** argv
-     sal_detail_initialize(argc, argv);   \
-     ret = sal_main_with_args(argc, argv); \
-     sal_detail_deinitialize(); \
--    return ret; \
-+    MAINRET(ret); \
- }
- 
- #define SAL_MAIN_IMPL \
-@@ -58,7 +71,7 @@ int SAL_CALL main(int argc, char ** argv
-     sal_detail_initialize(argc, argv); \
-     ret = sal_main(); \
-     sal_detail_deinitialize(); \
--    return ret; \
-+    MAINRET(ret); \
- }
- 
- /* Definition macros for CRT entries */
diff --git a/editors/libreoffice/files/patch-configure.in b/editors/libreoffice/files/patch-configure.in
deleted file mode 100644
index 95b13fcffbd7..000000000000
--- a/editors/libreoffice/files/patch-configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2012-07-20 10:58:45.000000000 +0000
-+++ configure.in	2011-08-25 06:28:12.256723704 +0000
-@@ -8089,7 +8089,7 @@ dnl ====================================
- dnl Number of CPUs to use during the build
- dnl ===================================================================
- AC_MSG_CHECKING([for number of processors to use])
--if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD"; then
-+if test "z`uname -s`" = "zDarwin" -o "z`uname -s`" = "zNetBSD" -o "z`uname -s`" = "zOpenBSD" -o "z`uname -s`" = "zFreeBSD"; then
-     BUILD_NCPUS=`sysctl -n hw.ncpu`
- else
-     BUILD_NCPUS=`grep $'^processor\t*:' /proc/cpuinfo | wc -l`
diff --git a/editors/libreoffice/files/patch-desktop__Executable_oosplash.mk b/editors/libreoffice/files/patch-desktop__Executable_oosplash.mk
new file mode 100644
index 000000000000..cefdf3173e7c
--- /dev/null
+++ b/editors/libreoffice/files/patch-desktop__Executable_oosplash.mk
@@ -0,0 +1,10 @@
+--- ./desktop/Executable_oosplash.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./desktop/Executable_oosplash.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -34,6 +34,7 @@
+ ))
+ 
+ $(eval $(call gb_Executable_add_linked_libs,oosplash,\
++    pthread \
+     sal \
+ ))
+ 
diff --git a/editors/libreoffice/files/patch-desktop__Executable_soffice.bin.mk b/editors/libreoffice/files/patch-desktop__Executable_soffice.bin.mk
new file mode 100644
index 000000000000..4c04a9ba1d46
--- /dev/null
+++ b/editors/libreoffice/files/patch-desktop__Executable_soffice.bin.mk
@@ -0,0 +1,10 @@
+--- ./desktop/Executable_soffice.bin.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./desktop/Executable_soffice.bin.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -42,6 +42,7 @@
+ 
+ $(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
+     sal \
++    pthread \
+     sofficeapp \
+ ))
+ 
diff --git a/editors/libreoffice/files/patch-desktop__Executable_unopkg.bin.mk b/editors/libreoffice/files/patch-desktop__Executable_unopkg.bin.mk
new file mode 100644
index 000000000000..c036ea12818b
--- /dev/null
+++ b/editors/libreoffice/files/patch-desktop__Executable_unopkg.bin.mk
@@ -0,0 +1,10 @@
+--- ./desktop/Executable_unopkg.bin.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./desktop/Executable_unopkg.bin.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -43,6 +43,7 @@
+ $(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\
+     comphelper \
+     sal \
++    pthread \
+     tl \
+     unopkgapp \
+ ))
diff --git a/editors/libreoffice/files/patch-jurt__source__pipe__makefile.mk b/editors/libreoffice/files/patch-jurt__source__pipe__makefile.mk
new file mode 100644
index 000000000000..162ca80f1d43
--- /dev/null
+++ b/editors/libreoffice/files/patch-jurt__source__pipe__makefile.mk
@@ -0,0 +1,11 @@
+--- ./jurt/source/pipe/makefile.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./jurt/source/pipe/makefile.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -51,6 +51,8 @@
+ 
+ SLOFILES = $(SHL1OBJS)
+ 
++LINKFLAGS += -fPIC
++
+ .IF "$(SOLAR_JAVA)" == ""
+ nothing .PHONY :
+ .END
diff --git a/editors/libreoffice/files/patch-sal__Module_sal.mk b/editors/libreoffice/files/patch-sal__Module_sal.mk
new file mode 100644
index 000000000000..b1efb9cdc2b5
--- /dev/null
+++ b/editors/libreoffice/files/patch-sal__Module_sal.mk
@@ -0,0 +1,15 @@
+--- ./sal/Module_sal.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./sal/Module_sal.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -28,12 +28,4 @@
+ 
+ $(eval $(call gb_Module_Module,sal))
+ 
+-$(eval $(call gb_Module_add_subsequentcheck_targets,sal,\
+-	CppunitTest_sal_osl_mutex \
+-	CppunitTest_sal_osl_pipe \
+-	CppunitTest_sal_osl_profile \
+-	CppunitTest_sal_osl_setthreadname \
+-	CppunitTest_sal_rtl_math \
+-))
+-
+ # vim: set noet sw=4 ts=4:
diff --git a/editors/libreoffice/files/patch-sc__Module_sc.mk b/editors/libreoffice/files/patch-sc__Module_sc.mk
new file mode 100644
index 000000000000..98c23b5db718
--- /dev/null
+++ b/editors/libreoffice/files/patch-sc__Module_sc.mk
@@ -0,0 +1,14 @@
+--- ./sc/Module_sc.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./sc/Module_sc.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -34,11 +34,6 @@
+ 	Package_xml \
+ ))
+ 
+-$(eval $(call gb_Module_add_check_targets,sc,\
+-    CppunitTest_sc_filters_test \
+-    CppunitTest_sc_ucalc \
+-))
+-
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
+     CppunitTest_sc_macros_test \
+     CppunitTest_sc_cellrangesbase \
diff --git a/editors/libreoffice/files/patch-sd__Module_sd.mk b/editors/libreoffice/files/patch-sd__Module_sd.mk
new file mode 100644
index 000000000000..25d167692b83
--- /dev/null
+++ b/editors/libreoffice/files/patch-sd__Module_sd.mk
@@ -0,0 +1,19 @@
+--- ./sd/Module_sd.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./sd/Module_sd.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -40,16 +40,6 @@
+     Package_xml \
+ ))
+ 
+-ifneq ($(OS),DRAGONFLY)
+-$(eval $(call gb_Module_add_check_targets,sd,\
+-    CppunitTest_sd_uimpress \
+-))
+-# disabled for now, seems to have incomplete deps and hangs on a build from scratch
+-#    CppunitTest_sd_filters_test \
+-
+-endif
+-
+-
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
+     JunitTest_sd_unoapi \
+ ))
diff --git a/editors/libreoffice/files/patch-set_soenv_in b/editors/libreoffice/files/patch-set_soenv_in
deleted file mode 100644
index ba5fd0af5329..000000000000
--- a/editors/libreoffice/files/patch-set_soenv_in
+++ /dev/null
@@ -1,26 +0,0 @@
---- set_soenv.in.orig	2011-08-25 06:07:10.245289335 +0000
-+++ set_soenv.in	2011-08-25 06:11:38.844523688 +0000
-@@ -352,13 +352,13 @@ elsif ( $platform =~ m/freebsd/ )
-       $OS             = "FREEBSD";
-       $PATH_SEPERATOR = $ps;
-       $OSVERSION      = '@OSVERSION@';
-+      $OUTPATH        = "unxfbsd";
-+      $outfile        = "FreeBSDAMDEnv.Set.sh";
-    if ($platform =~ m/^amd64/)
-    {  my ( $JAVA_OS );
-       print "Setting FreeBSD AMD64 specific values... ";
--      $outfile        = "FreeBSDAMDEnv.Set.sh";
-       $CPU            = "X";
-       $CPUNAME        = "X86_64";
--      $OUTPATH        = "unxfbsdx";
-       $JAVA_OS        = '@JAVA_HOME@';
-       $JAVA_OS        =~ s/.*\///;
-       if ($JAVA_OS =~ m/^linux/)
-@@ -377,7 +377,6 @@ elsif ( $platform =~ m/freebsd/ )
-       $outfile        = "FreeBSDX86Env.Set.sh";
-       $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";
diff --git a/editors/libreoffice/files/patch-solenv__bin__localize b/editors/libreoffice/files/patch-solenv__bin__localize
new file mode 100644
index 000000000000..76d2427fddc3
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__bin__localize
@@ -0,0 +1,8 @@
+--- ./solenv/bin/localize.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./solenv/bin/localize	2012-04-16 14:24:48.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ if [ x${SOLARENV}x = xx ]; then
+     echo No environment found, please use 'setsolar'
+ exit 1
diff --git a/editors/libreoffice/files/patch-solenv__gbuild__platform__com_GCC_defs.mk b/editors/libreoffice/files/patch-solenv__gbuild__platform__com_GCC_defs.mk
new file mode 100644
index 000000000000..675c996533c5
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__gbuild__platform__com_GCC_defs.mk
@@ -0,0 +1,18 @@
+--- ./solenv/gbuild/platform/com_GCC_defs.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./solenv/gbuild/platform/com_GCC_defs.mk	2012-04-16 15:52:47.000000000 +0200
+@@ -113,8 +113,13 @@
+ 
+ gb_LinkTarget_EXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_ON \
+-	-fexceptions \
+-	-fno-enforce-eh-specs \
++	-fexceptions
++
++# Clang doesn't have this option
++ifeq (,$(findstring /clang,$(CXX)))
++gb_LinkTarget_EXCEPTIONFLAGS += \
++	-fno-enforce-eh-specs
++endif
+ 
+ gb_LinkTarget_NOEXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_OFF \
diff --git a/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk
new file mode 100644
index 000000000000..db22b1721460
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk
@@ -0,0 +1,11 @@
+--- ./solenv/gbuild/platform/unxgcc.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./solenv/gbuild/platform/unxgcc.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -103,7 +103,7 @@
+ ifeq ($(HAVE_CXX0X),TRUE)
+ #Currently, as well as for its own merits, c++11/c++0x mode allows use to use
+ #a template for SAL_N_ELEMENTS to detect at compiler time its misuse
+-gb_CXXFLAGS += -std=c++0x
++gb_CXXFLAGS += -std=gnu++0x
+ 
+ #We have so many std::auto_ptr uses that we need to be able to disable
+ #warnings for those so that -Werror continues to be useful, seeing as moving
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk
deleted file mode 100644
index bda237663ef1..000000000000
--- a/editors/libreoffice/files/patch-solenv__inc__unxfbsd.mk
+++ /dev/null
@@ -1,190 +0,0 @@
---- solenv/inc/unxfbsd.mk.orig	2011-05-18 15:51:48.000000000 +0000
-+++ solenv/inc/unxfbsd.mk	2011-08-25 20:23:28.830637378 +0000
-@@ -27,178 +27,23 @@
- 
- # Makefile for FreeBSD.
- 
--ASM=
--AFLAGS=
--
--SOLAR_JAVA*=
--JAVAFLAGSDEBUG=-g
--
--# Include arch specific makefile.
-+# arch specific defines
- .IF "$(CPUNAME)" == "INTEL"
--.INCLUDE : unxfbsdi.mk
-+CDEFS+=-DX86
- .ENDIF
-+
- .IF "$(CPUNAME)" == "X86_64"
--.INCLUDE : unxfbsdx.mk
-+CDEFS+=-DX86_64
-+BUILD64=1
- .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
--
--# 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
-+.INCLUDE : unxgcc.mk
- 
--# 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+=-fmessage-length=0 -c
--
--# flags to enable build with symbols
--CFLAGSENABLESYMBOLS=-g
--
--# 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)
--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 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
--
--# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
--CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
--CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \
--    -Wno-non-virtual-dtor
--CFLAGSWALLCC=$(CFLAGSWARNCC)
--CFLAGSWALLCXX=$(CFLAGSWARNCXX)
--CFLAGSWERRCC=-Werror
--
--# Once all modules on this platform compile without warnings, set
--# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see
--# settings.mk): Currently this is not tested on FreeBSD
--#MODULES_WITH_WARNINGS :=
--
--# switches for dynamic and static linking
--STATIC		= -Wl,-Bstatic
--DYNAMIC		= -Wl,-Bdynamic
--
--# name of linker
--LINK*=$(CXX)
--LINKC*=$(CC)
-+CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS
- 
- # default linker flags
--LINKFLAGSDEFS*=#-Wl,-z,defs
--LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
--LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
--    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
--LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
--LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\'
--LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\'
--LINKFLAGSRUNPATH_OXT=
--LINKFLAGSRUNPATH_NONE=
--LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
--
--# linker flags for linking applications
--LINKFLAGSAPPGUI= -Wl,-export-dynamic
--LINKFLAGSAPPCUI= -Wl,-export-dynamic
--
--# 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
--STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm
--STDLIBCUIMT=$(PTHREAD_LIBS) -lm
--# libraries for linking shared libraries
--STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
--STDSHLCUIMT=$(PTHREAD_LIBS) -lm
--
--LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
--
--# 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=
-+LINKFLAGSDEFS:=
- 
- # platform specific identifier for shared libs
--DLLPRE=lib
--DLLPOST=.so
-+DLLPOSTFIX=fb
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk
deleted file mode 100644
index 24560ca0d9da..000000000000
--- a/editors/libreoffice/files/patch-solenv__inc__unxfbsdi.mk
+++ /dev/null
@@ -1,28 +0,0 @@
---- solenv/inc/unxfbsdi.mk.orig	2011-07-23 08:03:39.000000000 +0300
-+++ solenv/inc/unxfbsdi.mk	2011-07-23 08:26:34.000000000 +0300
-@@ -25,22 +25,7 @@
- #
- #*************************************************************************
- 
--#
--# FreBSD/i386 specific defines
--#
-- 
--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
--
--# Compiler flags for enabling optimizations
--.IF "$(PRODUCT)"!=""
--CFLAGSOPT=-Os -fno-strict-aliasing		# optimizing for products
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT= 					# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
-+# FreeBSD/i386 specific defines
- 
--# platform specific identifier for shared libs
--DLLPOSTFIX=fi
-+.INCLUDE : unxfbsd.mk
-+CDEFS+=-DX86 
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk b/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk
deleted file mode 100644
index c609b42d5aad..000000000000
--- a/editors/libreoffice/files/patch-solenv__inc__unxfbsdx.mk
+++ /dev/null
@@ -1,30 +0,0 @@
---- solenv/inc/unxfbsdx.mk.orig	2011-07-23 08:03:44.000000000 +0300
-+++ solenv/inc/unxfbsdx.mk	2011-07-23 08:26:13.000000000 +0300
-@@ -25,25 +25,8 @@
- #
- #*************************************************************************
- 
--#
--# FreBSD/amd64 specific defines
--#
-+# FreeBSD/amd64 specific defines
- 
-+.INCLUDE : unxfbsd.mk
- 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
--.ELSE 	# "$(PRODUCT)"!=""
--CFLAGSOPT=   					# no optimizing for non products
--.ENDIF	# "$(PRODUCT)"!=""
--
--# platform specific identifier for shared libs
--DLLPOSTFIX=fx
- BUILD64=1
diff --git a/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk b/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk
new file mode 100644
index 000000000000..834b6bfdbe77
--- /dev/null
+++ b/editors/libreoffice/files/patch-solenv__inc__unxgcc.mk
@@ -0,0 +1,20 @@
+--- ./solenv/inc/unxgcc.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./solenv/inc/unxgcc.mk	2012-04-17 00:58:31.000000000 +0200
+@@ -78,7 +78,7 @@
+ # flags for the C++ Compiler
+ CFLAGSCC= -pipe $(ARCH_FLAGS)
+ # Flags for enabling exception handling
+-CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++CFLAGSEXCEPTIONS=-fexceptions
+ # Flags for disabling exception handling
+ CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
+@@ -88,7 +88,7 @@
+ CFLAGSCXX+=-fvisibility-inlines-hidden
+ .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+ .IF "$(HAVE_CXX0X)" == "TRUE"
+-CFLAGSCXX+=-std=c++0x
++CFLAGSCXX+=-std=gnu++0x
+ .IF "$(GCCNUMVER)" <= "000400059999"
+ CFLAGSCXX+=-Wno-deprecated-declarations
+ .ENDIF
diff --git a/editors/libreoffice/files/patch-svx__source__customshapes__EnhancedCustomShapeGeometry.cxx b/editors/libreoffice/files/patch-svx__source__customshapes__EnhancedCustomShapeGeometry.cxx
new file mode 100644
index 000000000000..66a9b421b626
--- /dev/null
+++ b/editors/libreoffice/files/patch-svx__source__customshapes__EnhancedCustomShapeGeometry.cxx
@@ -0,0 +1,2422 @@
+--- ./svx/source/customshapes/EnhancedCustomShapeGeometry.cxx.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./svx/source/customshapes/EnhancedCustomShapeGeometry.cxx	2012-04-16 14:24:48.000000000 +0200
+@@ -26,8 +26,13 @@
+  *
+  ************************************************************************/
+ 
++#include <limits>
++
+ #include "svx/EnhancedCustomShapeGeometry.hxx"
+ #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
++
++static const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min();
++
+ /*
+ static const SvxMSDffVertPair Vert[] =
+ {
+@@ -58,7 +63,7 @@
+     (sal_Int32*)mso_sptDefault,
+     (SvxMSDffTextRectangles*)mso_sptTextRect, sizeof( mso_sptTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptVert, sizeof( mso_sptVert ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandles*)mso_sptHandles, sizeof( mso_sptHandles ) / sizeof( SvxMSDffHandles )
+ };
+@@ -161,9 +166,9 @@
+ static const SvxMSDffHandle mso_sptArcHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        10800, 0x100, 10800, 10800, 10800, 10800, 0x80000000, 0x7fffffff },
++        10800, 0x100, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        10800, 0x101, 10800, 10800, 10800, 10800, 0x80000000, 0x7fffffff }
++        10800, 0x101, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoArc =
+ {
+@@ -173,7 +178,7 @@
+     (sal_Int32*)mso_sptArcDefault,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptArcHandle, sizeof( mso_sptArcHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -190,7 +195,7 @@
+     NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -207,7 +212,7 @@
+     NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -242,7 +247,7 @@
+ static const SvxMSDffHandle mso_sptRoundRectangleHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoRoundRectangle =
+ {
+@@ -277,7 +282,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptRightTriangleTextRect, sizeof( mso_sptRightTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptRightTriangleGluePoints, sizeof( mso_sptRightTriangleGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -306,7 +311,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -347,7 +352,7 @@
+ static const SvxMSDffHandle mso_sptParallelogramHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoParallelogram =
+ {
+@@ -357,7 +362,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptParallelogramTextRect, sizeof( mso_sptParallelogramTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptParallelogramGluePoints, sizeof( mso_sptParallelogramGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptParallelogramHandle, sizeof( mso_sptParallelogramHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -378,7 +383,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptDiamondTextRect, sizeof( mso_sptDiamondTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -412,7 +417,7 @@
+ static const SvxMSDffHandle mso_sptTrapezoidHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 1, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 1, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoTrapezoid =
+ {
+@@ -422,7 +427,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptTrapezoidTextRect, sizeof( mso_sptTrapezoidTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptTrapezoidGluePoints, sizeof( mso_sptTrapezoidGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptTrapezoidHandle, sizeof( mso_sptTrapezoidHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -459,7 +464,7 @@
+ static const SvxMSDffHandle mso_sptOctagonHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoOctagon =
+ {
+@@ -505,7 +510,7 @@
+ static const SvxMSDffHandle mso_sptIsocelesTriangleHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoIsocelesTriangle =
+ {
+@@ -515,7 +520,7 @@
+     (sal_Int32*)mso_sptDefault10800,
+     (SvxMSDffTextRectangles*)mso_sptIsocelesTriangleTextRect, sizeof( mso_sptIsocelesTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptIsocelesTriangleGluePoints, sizeof( mso_sptIsocelesTriangleGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptIsocelesTriangleHandle, sizeof( mso_sptIsocelesTriangleHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -544,7 +549,7 @@
+ static const SvxMSDffHandle mso_sptHexagonHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoHexagon =
+ {
+@@ -554,7 +559,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptHexagonTextRect, sizeof( mso_sptHexagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptHexagonHandle, sizeof( mso_sptHexagonHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -581,7 +586,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptPentagonTextRect, sizeof( mso_sptPentagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptPentagonGluePoints, sizeof( mso_sptPentagonGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -606,7 +611,7 @@
+ static const SvxMSDffHandle mso_sptPlusHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoPlus =
+ {
+@@ -663,7 +668,7 @@
+ static const SvxMSDffHandle mso_sptCanHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        7 + 3, 0x100, 44, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        7 + 3, 0x100, 44, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoCan =
+ {
+@@ -673,7 +678,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptCanTextRect, sizeof( mso_sptCanTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     88, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptCanGluePoints, sizeof( mso_sptCanGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptCanHandle, sizeof( mso_sptCanHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -715,7 +720,7 @@
+     (sal_Int32*)mso_sptDefault16200and5400,
+     (SvxMSDffTextRectangles*)mso_sptArrowTextRect, sizeof( mso_sptArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptArrowHandle, sizeof( mso_sptArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -750,7 +755,7 @@
+     (sal_Int32*)mso_sptLeftArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftArrowTextRect, sizeof( mso_sptLeftArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftArrowHandle, sizeof( mso_sptLeftArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -781,7 +786,7 @@
+     (sal_Int32*)mso_sptDefault16200and5400,
+     (SvxMSDffTextRectangles*)mso_sptDownArrowTextRect, sizeof( mso_sptDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptDownArrowHandle, sizeof( mso_sptDownArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -816,7 +821,7 @@
+     (sal_Int32*)mso_sptUpArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptUpArrowTextRect, sizeof( mso_sptUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptUpArrowHandle, sizeof( mso_sptUpArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -865,7 +870,7 @@
+     (sal_Int32*)mso_sptLeftRightArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftRightArrowTextRect, sizeof( mso_sptLeftRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftRightArrowHandle, sizeof( mso_sptLeftRightArrowHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -901,7 +906,7 @@
+     (sal_Int32*)mso_sptUpDownArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptUpDownArrowTextRect, sizeof( mso_sptUpDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptUpDownArrowHandle, sizeof( mso_sptUpDownArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -941,7 +946,7 @@
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+         0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 0x101, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoQuadArrow =
+ {
+@@ -951,7 +956,7 @@
+     (sal_Int32*)mso_sptQuadArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptQuadArrowTextRect, sizeof( mso_sptQuadArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptQuadArrowHandle, sizeof( mso_sptQuadArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -990,7 +995,7 @@
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+         0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 0x101, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoLeftRightUpArrow =
+ {
+@@ -1000,7 +1005,7 @@
+     (sal_Int32*)mso_sptLeftRightUpArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftRightUpArrowTextRect, sizeof( mso_sptLeftRightUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftRightUpArrowHandle, sizeof( mso_sptLeftRightUpArrowHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -1044,7 +1049,7 @@
+     (sal_Int32*)mso_sptBentArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptBentArrowTextRect, sizeof( mso_sptBentArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBentArrowHandle, sizeof( mso_sptBentArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -1075,7 +1080,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptUturnArrowTextRect, sizeof( mso_sptUturnArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -1117,7 +1122,7 @@
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+         0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 3 + 9, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0x102, 3 + 9, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoLeftUpArrow =
+ {
+@@ -1127,7 +1132,7 @@
+     (sal_Int32*)mso_sptLeftUpArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftUpArrowTextRect, sizeof( mso_sptLeftUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftUpArrowHandle, sizeof( mso_sptLeftUpArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -1170,7 +1175,7 @@
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+         0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 3 + 10, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0x102, 3 + 10, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBentUpArrow =
+ {
+@@ -1180,7 +1185,7 @@
+     (sal_Int32*)mso_sptBentUpArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptBentUpArrowTextRect, sizeof( mso_sptBentUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBentUpArrowHandle, sizeof( mso_sptBentUpArrowHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1288,7 +1293,7 @@
+     (sal_Int32*)mso_sptCurvedRightDefault,
+     (SvxMSDffTextRectangles*)mso_sptCurvedRightTextRect, sizeof( mso_sptCurvedRightTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptCurvedRightGluePoints, sizeof( mso_sptCurvedRightGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptCurvedRightHandles, sizeof( mso_sptCurvedRightHandles ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1343,7 +1348,7 @@
+    (sal_Int32*)mso_sptCurvedRightDefault,
+    (SvxMSDffTextRectangles*)mso_sptCurvedDownTextRect, sizeof( mso_sptCurvedDownTextRect ) / sizeof( SvxMSDffTextRectangles ),
+    21600, 21600,
+-   0x80000000, 0x80000000,
++   MIN_INT32, MIN_INT32,
+    (SvxMSDffVertPair*)mso_sptCurvedDownGluePoints, sizeof( mso_sptCurvedDownGluePoints ) / sizeof( SvxMSDffVertPair ),
+    (SvxMSDffHandle*)mso_sptCurvedDownHandles, sizeof( mso_sptCurvedDownHandles ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1449,7 +1454,7 @@
+    (sal_Int32*)mso_sptCurvedUpDefault,
+    (SvxMSDffTextRectangles*)mso_sptCurvedUpTextRect, sizeof( mso_sptCurvedUpTextRect ) / sizeof( SvxMSDffTextRectangles ),
+    21600, 21600,
+-   0x80000000, 0x80000000,
++   MIN_INT32, MIN_INT32,
+    (SvxMSDffVertPair*)mso_sptCurvedUpGluePoints, sizeof( mso_sptCurvedUpGluePoints ) / sizeof( SvxMSDffVertPair ),
+    (SvxMSDffHandle*)mso_sptCurvedUpHandles, sizeof( mso_sptCurvedUpHandles ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1502,7 +1507,7 @@
+     (sal_Int32*)mso_sptCurvedUpDefault,
+     (SvxMSDffTextRectangles*)mso_sptCurvedLeftTextRect, sizeof( mso_sptCurvedLeftTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptCurvedLeftGluePoints, sizeof( mso_sptCurvedLeftGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptCurvedLeftHandles, sizeof( mso_sptCurvedLeftHandles ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1546,7 +1551,7 @@
+     (sal_Int32*)mso_sptDefault16200and5400,
+     (SvxMSDffTextRectangles*)mso_sptStripedRightArrowTextRect, sizeof( mso_sptStripedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptStripedRightArrowHandle, sizeof( mso_sptStripedRightArrowHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1582,7 +1587,7 @@
+     (sal_Int32*)mso_sptDefault16200and5400,
+     (SvxMSDffTextRectangles*)mso_sptNotchedRightArrowTextRect, sizeof( mso_sptNotchedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptNotchedRightArrowHandle, sizeof( mso_sptNotchedRightArrowHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1611,7 +1616,7 @@
+ static const SvxMSDffHandle mso_sptHomePlateHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoHomePlate =
+ {
+@@ -1621,7 +1626,7 @@
+     (sal_Int32*)mso_sptHomePlateDefault,
+     (SvxMSDffTextRectangles*)mso_sptHomePlateTextRect, sizeof( mso_sptHomePlateTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptHomePlateHandle, sizeof( mso_sptHomePlateHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1651,7 +1656,7 @@
+ static const SvxMSDffHandle mso_sptChevronHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoChevron =
+ {
+@@ -1661,7 +1666,7 @@
+     (sal_Int32*)mso_sptChevronDefault,
+     (SvxMSDffTextRectangles*)mso_sptChevronTextRect, sizeof( mso_sptChevronTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptChevronHandle, sizeof( mso_sptChevronHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1696,11 +1701,11 @@
+ static const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0, 0x102, 0x80000000, 0x7fffffff },
++        0x100, 0, 10800, 10800, 0, 0x102, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+         0x102, 0x103, 10800, 10800, 0x100, 21600, 0x101, 10800 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        1, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
++        1, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
+ };
+ static const mso_CustomShape msoRightArrowCallout =
+ {
+@@ -1710,7 +1715,7 @@
+     (sal_Int32*)mso_sptRightArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptRightArrowCalloutTextRect, sizeof( mso_sptRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptRightArrowCalloutHandle, sizeof( mso_sptRightArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1745,11 +1750,11 @@
+ static const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 21600, 0x80000000, 0x7fffffff },
++        0x100, 0, 10800, 10800, 0x102, 21600, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+         0x102, 0x103, 10800, 10800, 0, 0x100, 0x101, 10800 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
++        0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
+ };
+ static const mso_CustomShape msoLeftArrowCallout =
+ {
+@@ -1759,7 +1764,7 @@
+     (sal_Int32*)mso_sptLeftArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftArrowCalloutTextRect, sizeof( mso_sptLeftArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftArrowCalloutHandle, sizeof( mso_sptLeftArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1794,11 +1799,11 @@
+ static const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 21600 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 21600 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+         0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x101, 0, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
++        0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoUpArrowCallout =
+ {
+@@ -1808,7 +1813,7 @@
+     (sal_Int32*)mso_sptUpArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptUpArrowCalloutTextRect, sizeof( mso_sptUpArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptUpArrowCalloutHandle, sizeof( mso_sptUpArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1843,11 +1848,11 @@
+ static const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x102 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x102 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+         0x103, 0x102, 10800, 10800, 0x101, 10800, 0x100, 21600 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x101, 1, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
++        0x101, 1, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoDownArrowCallout =
+ {
+@@ -1857,7 +1862,7 @@
+     (sal_Int32*)mso_sptDownArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptDownArrowCalloutTextRect, sizeof( mso_sptDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptDownArrowCalloutHandle, sizeof( mso_sptDownArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1896,11 +1901,11 @@
+ static const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+-        0x100, 0, 10800, 10800, 0x102, 10800, 0x80000000, 0x7fffffff },
++        0x100, 0, 10800, 10800, 0x102, 10800, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+         0x102, 0x103, 10800, 10800, 0, 0x100, 0x101, 10800 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
++        0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
+ };
+ static const mso_CustomShape msoLeftRightArrowCallout =
+ {
+@@ -1910,7 +1915,7 @@
+     (sal_Int32*)mso_sptLeftRightArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftRightArrowCalloutTextRect, sizeof( mso_sptLeftRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptLeftRightArrowCalloutHandle, sizeof( mso_sptLeftRightArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -1949,11 +1954,11 @@
+ static const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 10800 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 10800 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+         0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        0x101, 0, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
++        0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoUpDownArrowCallout =
+ {
+@@ -1963,7 +1968,7 @@
+     (sal_Int32*)mso_sptUpDownArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptUpDownArrowCalloutTextRect, sizeof( mso_sptUpDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptUpDownArrowCalloutHandle, sizeof( mso_sptUpDownArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -2005,9 +2010,9 @@
+ static const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 0x101 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 0x101 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
+-        0x101, 0, 10800, 10800, 0x100, 10800, 0x80000000, 0x7fffffff },
++        0x101, 0, 10800, 10800, 0x100, 10800, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+         0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 }
+ };
+@@ -2019,7 +2024,7 @@
+     (sal_Int32*)mso_sptQuadArrowCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptQuadArrowCalloutTextRect, sizeof( mso_sptQuadArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptQuadArrowCalloutHandle, sizeof( mso_sptQuadArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -2103,9 +2108,9 @@
+ static const SvxMSDffHandle mso_sptCircularArrowHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        10800, 0x100, 10800, 10800, 10800, 10800, 0xff4c0000, 0x00b40000 },
++        10800, 0x100, 10800, 10800, 10800, 10800, -0x7f4c0000, 0x00b40000 },
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        0x102, 0x101, 10800, 10800, 0, 10800, 0xff4c0000, 0x00b40000 }
++        0x102, 0x101, 10800, 10800, 0, 10800, -0x7f4c0000, 0x00b40000 }
+ };
+ static const mso_CustomShape msoCircularArrow =
+ {
+@@ -2115,7 +2120,7 @@
+     (sal_Int32*)mso_sptCircularArrowDefault,
+     (SvxMSDffTextRectangles*)mso_sptCircularArrowTextRect, sizeof( mso_sptCircularArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCircularArrowHandle, sizeof( mso_sptCircularArrowHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -2155,7 +2160,7 @@
+ static const SvxMSDffHandle mso_sptCubeHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
+ };
+ static const SvxMSDffVertPair mso_sptCubeGluePoints[] =
+ {
+@@ -2204,7 +2209,7 @@
+ static const SvxMSDffHandle mso_sptBevelHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBevel =
+ {
+@@ -2256,7 +2261,7 @@
+ static const SvxMSDffHandle mso_sptFoldedCornerHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 1, 10800, 10800, 10800, 21600, 0x80000000, 0x7fffffff }
++        0x100, 1, 10800, 10800, 10800, 21600, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoFoldedCorner =
+ {
+@@ -2266,7 +2271,7 @@
+     (sal_Int32*)mso_sptFoldedCornerDefault,
+     (SvxMSDffTextRectangles*)mso_sptFoldedCornerTextRect, sizeof( mso_sptFoldedCornerTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptFoldedCornerHandle, sizeof( mso_sptFoldedCornerHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -2300,7 +2305,7 @@
+ static const SvxMSDffHandle mso_sptButtonHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 5400, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 5400, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoActionButtonBlank =
+ {
+@@ -3111,7 +3116,7 @@
+ static const SvxMSDffHandle mso_sptSmileyHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 15510, 17520 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 15510, 17520 }
+ };
+ static const mso_CustomShape msoSmileyFace =
+ {
+@@ -3121,7 +3126,7 @@
+     (sal_Int32*)mso_sptSmileyFaceDefault,
+     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptSmileyHandle, sizeof( mso_sptSmileyHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3143,7 +3148,7 @@
+ static const SvxMSDffHandle mso_sptDonutHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoDonut =
+ {
+@@ -3153,7 +3158,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptDonutHandle, sizeof( mso_sptDonutHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3192,7 +3197,7 @@
+ static const SvxMSDffHandle mso_sptNoSmokingHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0, 7200, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, 0, 7200, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoNoSmoking =
+ {
+@@ -3202,7 +3207,7 @@
+     (sal_Int32*)mso_sptDefault2700,
+     (SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptNoSmokingHandle, sizeof( mso_sptNoSmokingHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3235,7 +3240,7 @@
+ static const SvxMSDffHandle mso_sptBlockArcHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        0x101, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x101, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBlockArc =
+ {
+@@ -3245,7 +3250,7 @@
+     (sal_Int32*)mso_sptBlockArcDefault,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBlockArcHandle, sizeof( mso_sptBlockArcHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3309,7 +3314,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptHeartTextRect, sizeof( mso_sptHeartTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21615, 21602,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptHeartGluePoints, sizeof( mso_sptHeartGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -3337,7 +3342,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptLightningBoldTextRect, sizeof( mso_sptLightningBoldTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptLightningBoldGluePoints, sizeof( mso_sptLightningBoldGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -3431,7 +3436,7 @@
+ static const SvxMSDffHandle mso_sptSunHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 2700, 10125, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, 2700, 10125, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoSun =
+ {
+@@ -3441,7 +3446,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptSunTextRect, sizeof( mso_sptSunTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptSunHandle, sizeof( mso_sptSunHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3483,7 +3488,7 @@
+ static const SvxMSDffHandle mso_sptMoonHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0, 18900, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, 0, 18900, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoMoon =
+ {
+@@ -3493,7 +3498,7 @@
+     (sal_Int32*)mso_sptDefault10800,
+     (SvxMSDffTextRectangles*)mso_sptMoonTextRect, sizeof( mso_sptMoonTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptMoonGluePoints, sizeof( mso_sptMoonGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptMoonHandle, sizeof( mso_sptMoonHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3536,7 +3541,7 @@
+ static const SvxMSDffHandle mso_sptBracketPairHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBracketPair =
+ {
+@@ -3546,7 +3551,7 @@
+     (sal_Int32*)mso_sptDefault3700,
+     (SvxMSDffTextRectangles*)mso_sptBracketPairTextRect, sizeof( mso_sptBracketPairTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    10800, 0x80000000,
++    10800, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptBracketPairHandle, sizeof( mso_sptBracketPairHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3562,7 +3567,7 @@
+ static const SvxMSDffHandle mso_sptPlaqueHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoPlaque =
+ {
+@@ -3614,7 +3619,7 @@
+ static const SvxMSDffHandle mso_sptBracePairHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 }
+ };
+ static const mso_CustomShape msoBracePair =
+ {
+@@ -3624,7 +3629,7 @@
+     (sal_Int32*)mso_sptDefault1800,
+     (SvxMSDffTextRectangles*)mso_sptBracePairTextRect, sizeof( mso_sptBracePairTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    10800, 0x80000000,
++    10800, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptBracePairHandle, sizeof( mso_sptBracePairHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3657,7 +3662,7 @@
+ static const SvxMSDffHandle mso_sptLeftBracketHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoLeftBracket =
+ {
+@@ -3667,7 +3672,7 @@
+     (sal_Int32*)mso_sptDefault1800,
+     (SvxMSDffTextRectangles*)mso_sptLeftBracketTextRect, sizeof( mso_sptLeftBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptLeftBracketHandle, sizeof( mso_sptLeftBracketHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3687,7 +3692,7 @@
+ static const SvxMSDffHandle mso_sptRightBracketHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        1, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        1, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoRightBracket =
+ {
+@@ -3697,7 +3702,7 @@
+     (sal_Int32*)mso_sptDefault1800,
+     (SvxMSDffTextRectangles*)mso_sptRightBracketTextRect, sizeof( mso_sptRightBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptRightBracketHandle, sizeof( mso_sptRightBracketHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3741,9 +3746,9 @@
+ static const SvxMSDffHandle mso_sptLeftBraceHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 },
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
++        0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
+ };
+ static const mso_CustomShape msoLeftBrace =     // adj value0 0 -> 5400
+ {                                               // adj value1 0 -> 21600
+@@ -3753,7 +3758,7 @@
+     (sal_Int32*)mso_sptBraceDefault,
+     (SvxMSDffTextRectangles*)mso_sptLeftBraceTextRect, sizeof( mso_sptLeftBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptLeftBraceHandle, sizeof( mso_sptLeftBraceHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -3774,9 +3779,9 @@
+ static const SvxMSDffHandle mso_sptRightBraceHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 },
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        1, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
++        1, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
+ };
+ static const mso_CustomShape msoRightBrace =        // adj value0 0 -> 5400
+ {                                               // adj value1 0 -> 21600
+@@ -3786,7 +3791,7 @@
+     (sal_Int32*)mso_sptBraceDefault,
+     (SvxMSDffTextRectangles*)mso_sptRightBraceTextRect, sizeof( mso_sptRightBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptRightBraceHandle, sizeof( mso_sptRightBraceHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3816,7 +3821,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptIrregularSeal1TextRect, sizeof( mso_sptIrregularSeal1TextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptIrregularSeal1GluePoints, sizeof( mso_sptIrregularSeal1GluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -3848,7 +3853,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptIrregularSeal2TextRect, sizeof( mso_sptIrregularSeal2TextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptIrregularSeal2GluePoints, sizeof( mso_sptIrregularSeal2GluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -3874,7 +3879,7 @@
+ static const SvxMSDffHandle mso_sptSealHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoSeal4 =
+ {
+@@ -3884,7 +3889,7 @@
+     (sal_Int32*)mso_sptDefault8100,
+     (SvxMSDffTextRectangles*)mso_sptSeal4TextRect, sizeof( mso_sptSeal4TextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -3907,7 +3912,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptStarTextRect, sizeof( mso_sptStarTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -4036,7 +4041,7 @@
+     (sal_Int32*)mso_sptDefault2500,
+     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -4132,7 +4137,7 @@
+     (sal_Int32*)mso_sptDefault2500,
+     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -4160,7 +4165,7 @@
+     (sal_Int32*)mso_sptDefault2500,
+     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )      // handles
+ };
+@@ -4328,7 +4333,7 @@
+     (sal_Int32*)mso_sptDefault2500,
+     (SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -4413,9 +4418,9 @@
+ static const SvxMSDffHandle mso_sptRibbon2Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 2700, 8100, 0x80000000, 0x7fffffff },
++        0x100, 0, 10800, 10800, 2700, 8100, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 14400, 21600 }
++        10800, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 14400, 21600 }
+ };
+ static const mso_CustomShape msoRibbon2 =
+ {
+@@ -4425,7 +4430,7 @@
+     (sal_Int32*)mso_sptRibbon2Default,
+     (SvxMSDffTextRectangles*)mso_sptRibbon2TextRect, sizeof( mso_sptRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptRibbon2Handle, sizeof( mso_sptRibbon2Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -4494,9 +4499,9 @@
+ static const SvxMSDffHandle mso_sptRibbonHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 2700, 8100, 0x80000000, 0x7fffffff },
++        0x100, 0, 10800, 10800, 2700, 8100, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 7200 }
++        10800, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 7200 }
+ };
+ static const mso_CustomShape msoRibbon =
+ {
+@@ -4506,7 +4511,7 @@
+     (sal_Int32*)mso_sptRibbonDefault,
+     (SvxMSDffTextRectangles*)mso_sptRibbonTextRect, sizeof( mso_sptRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptRibbonGluePoints, sizeof( mso_sptRibbonGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptRibbonHandle, sizeof( mso_sptRibbonHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -4562,7 +4567,7 @@
+ static const SvxMSDffHandle mso_sptVerticalScrollHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 }
+ };
+ static const mso_CustomShape msoVerticalScroll =
+ {
+@@ -4608,7 +4613,7 @@
+ static const SvxMSDffHandle mso_sptHorizontalScrollHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 5400, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 5400, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoHorizontalScroll =
+ {
+@@ -4635,7 +4640,7 @@
+     NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4672,7 +4677,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartAlternateProcessTextRect, sizeof( mso_sptFlowChartAlternateProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4693,7 +4698,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartDecisionTextRect, sizeof( mso_sptFlowChartDecisionTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4718,7 +4723,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartInputOutputTextRect, sizeof( mso_sptFlowChartInputOutputTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartInputOutputGluePoints, sizeof( mso_sptFlowChartInputOutputGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4749,7 +4754,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartPredefinedProcessTextRect, sizeof( mso_sptFlowChartPredefinedProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -4780,7 +4785,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartInternalStorageTextRect, sizeof( mso_sptFlowChartInternalStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -4811,7 +4816,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartDocumentTextRect, sizeof( mso_sptFlowChartDocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartDocumentGluePoints, sizeof( mso_sptFlowChartDocumentGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4850,7 +4855,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartMultidocumentTextRect, sizeof( mso_sptFlowChartMultidocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartMultidocumentGluePoints, sizeof( mso_sptFlowChartMultidocumentGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4876,7 +4881,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartTerminatorTextRect, sizeof( mso_sptFlowChartTerminatorTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4898,7 +4903,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartPreparationTextRect, sizeof( mso_sptFlowChartPreparationTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4923,7 +4928,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartManualInputTextRect, sizeof( mso_sptFlowChartManualInputTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartManualInputGluePoints, sizeof( mso_sptFlowChartManualInputGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4948,7 +4953,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartManualOperationTextRect, sizeof( mso_sptFlowChartManualOperationTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartManualOperationGluePoints, sizeof( mso_sptFlowChartManualOperationGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4973,7 +4978,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartConnectorTextRect, sizeof( mso_sptFlowChartConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -4995,7 +5000,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartOffpageConnectorTextRect, sizeof( mso_sptFlowChartOffpageConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5017,7 +5022,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedCardTextRect, sizeof( mso_sptFlowChartPunchedCardTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5055,7 +5060,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartPunchedTapeTextRect, sizeof( mso_sptFlowChartPunchedTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeGluePoints, sizeof( mso_sptFlowChartPunchedTapeGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5088,7 +5093,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartSummingJunctionTextRect, sizeof( mso_sptFlowChartSummingJunctionTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5119,7 +5124,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartOrTextRect, sizeof( mso_sptFlowChartOrTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5144,7 +5149,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartCollateTextRect, sizeof( mso_sptFlowChartCollateTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartCollateGluePoints, sizeof( mso_sptFlowChartCollateGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5172,7 +5177,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartSortTextRect, sizeof( mso_sptFlowChartSortTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0     // handles
+ };
+@@ -5197,7 +5202,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartExtractTextRect, sizeof( mso_sptFlowChartExtractTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5218,7 +5223,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartMergeTextRect, sizeof( mso_sptFlowChartMergeTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5248,7 +5253,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartOnlineStorageTextRect, sizeof( mso_sptFlowChartOnlineStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageGluePoints, sizeof( mso_sptFlowChartOnlineStorageGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5274,7 +5279,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartDelayTextRect, sizeof( mso_sptFlowChartDelayTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5303,7 +5308,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticTapeTextRect, sizeof( mso_sptFlowChartMagneticTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5336,7 +5341,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDiskTextRect, sizeof( mso_sptFlowChartMagneticDiskTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskGluePoints, sizeof( mso_sptFlowChartMagneticDiskGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5369,7 +5374,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDrumTextRect, sizeof( mso_sptFlowChartMagneticDrumTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumGluePoints, sizeof( mso_sptFlowChartMagneticDrumGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5395,7 +5400,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFlowChartDisplayTextRect, sizeof( mso_sptFlowChartDisplayTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
+     NULL, 0     // handles
+ };
+@@ -5477,7 +5482,7 @@
+ {
+     {
+         0,
+-        0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff
++        0x100, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff
+     }
+ };
+ static const mso_CustomShape msoWedgeRectCallout =
+@@ -5488,7 +5493,7 @@
+     (sal_Int32*)mso_sptWedgeRectCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptWedgeRectCalloutTextRect, sizeof( mso_sptWedgeRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptWedgeRectCalloutGluePoints, sizeof( mso_sptWedgeRectCalloutGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -5524,7 +5529,7 @@
+     (sal_Int32*)mso_sptWedgeRectCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptWedgeRRectCalloutTextRect, sizeof( mso_sptWedgeRRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -5548,7 +5553,7 @@
+ {
+     {
+         MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 1, 10800, 10800, 0, 8990, 0x80000000, 0x7fffffff
++        0x100, 1, 10800, 10800, 0, 8990, MIN_INT32, 0x7fffffff
+     }
+ };
+ static const SvxMSDffTextRectangles mso_sptBalloonTextRect[] =
+@@ -5563,7 +5568,7 @@
+     (sal_Int32*)mso_sptWedgeRectCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptBalloonTextRect, sizeof( mso_sptBalloonTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBalloonHandle, sizeof( mso_sptBalloonHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -5622,7 +5627,7 @@
+     (sal_Int32*)mso_sptWedgeEllipseCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptWedgeEllipseCalloutTextRect, sizeof( mso_sptWedgeEllipseCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptWedgeEllipseCalloutGluePoints, sizeof( mso_sptWedgeEllipseCalloutGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -5727,7 +5732,7 @@
+     (sal_Int32*)mso_sptCloudCalloutDefault,
+     (SvxMSDffTextRectangles*)mso_sptCloudCalloutTextRect, sizeof( mso_sptCloudCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle )        // handles
+ };
+@@ -5785,9 +5790,9 @@
+ static const SvxMSDffHandle mso_sptWaveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 4460 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 4460 },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
++        0x101, 21600, 10800, 10800, 8640, 12960, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptWaveDefault[] =
+ {
+@@ -5805,7 +5810,7 @@
+     (sal_Int32*)mso_sptWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptWaveTextRect, sizeof( mso_sptWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptWaveGluePoints, sizeof( mso_sptWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptWaveHandle, sizeof( mso_sptWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -5867,9 +5872,9 @@
+ static const SvxMSDffHandle mso_sptDoubleWaveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 2230 },
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 2230 },
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
++        0x101, 21600, 10800, 10800, 8640, 12960, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptDoubleWaveDefault[] =
+ {
+@@ -5887,7 +5892,7 @@
+     (sal_Int32*)mso_sptDoubleWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, sizeof( mso_sptDoubleWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, sizeof( mso_sptDoubleWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptDoubleWaveHandle, sizeof( mso_sptDoubleWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -5985,7 +5990,7 @@
+     NULL,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     NULL, 0 // Handles
+ };
+@@ -6013,7 +6018,7 @@
+ static const SvxMSDffHandle mso_sptTextPlainTextHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 21600, 10800, 10800, 6629, 14971, 0x80000000, 0x7fffffff }
++        0x100, 21600, 10800, 10800, 6629, 14971, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoTextPlainText =
+ {
+@@ -6023,7 +6028,7 @@
+     (sal_Int32*)mso_sptDefault10800,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextPlainTextHandle, sizeof( mso_sptTextPlainTextHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6050,7 +6055,7 @@
+ static const SvxMSDffHandle mso_sptTextStopHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 3080, 10800 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 3080, 10800 }
+ };
+ static const mso_CustomShape msoTextStop =
+ {
+@@ -6060,7 +6065,7 @@
+     (sal_Int32*)mso_sptTextStopDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextStopHandle, sizeof( mso_sptTextStopHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6081,7 +6086,7 @@
+ static const SvxMSDffHandle mso_sptTextTriangleHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
+ };
+ static const mso_CustomShape msoTextTriangle =
+ {
+@@ -6091,7 +6096,7 @@
+     (sal_Int32*)mso_sptDefault10800,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextTriangleHandle, sizeof( mso_sptTextTriangleHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6112,7 +6117,7 @@
+     (sal_Int32*)mso_sptDefault10800,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextTriangleHandle, sizeof( mso_sptTextTriangleHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6134,7 +6139,7 @@
+ static const SvxMSDffHandle mso_sptTextChevronHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoTextChevron =
+ {
+@@ -6144,7 +6149,7 @@
+     (sal_Int32*)mso_sptDefault5400,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextChevronHandle, sizeof( mso_sptTextChevronHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6166,7 +6171,7 @@
+ static const SvxMSDffHandle mso_sptTextChevronInvertedHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 10800, 21600 }
+ };
+ static const mso_CustomShape msoTextChevronInverted =
+ {
+@@ -6176,7 +6181,7 @@
+     (sal_Int32*)mso_sptDefault16200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, sizeof( mso_sptTextChevronInvertedHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6199,7 +6204,7 @@
+ static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 10800, 21600 }
+ };
+ static const mso_CustomShape msoTextRingOutside =
+ {
+@@ -6209,7 +6214,7 @@
+     (sal_Int32*)mso_sptDefault16200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextRingOutsideHandle, sizeof( mso_sptTextRingOutsideHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6231,7 +6236,7 @@
+ static const SvxMSDffHandle mso_sptTextFadeRightHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        21600, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        21600, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoTextFadeRight =
+ {
+@@ -6241,7 +6246,7 @@
+     (sal_Int32*)mso_sptDefault7200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextFadeRightHandle, sizeof( mso_sptTextFadeRightHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6253,7 +6258,7 @@
+ static const SvxMSDffHandle mso_sptTextFadeLeftHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
+ };
+ static const mso_CustomShape msoTextFadeLeft =
+ {
+@@ -6263,7 +6268,7 @@
+     (sal_Int32*)mso_sptDefault7200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextFadeLeftHandle, sizeof( mso_sptTextFadeLeftHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6275,7 +6280,7 @@
+ static const SvxMSDffHandle mso_sptTextFadeUpHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoTextFadeUp =
+ {
+@@ -6285,7 +6290,7 @@
+     (sal_Int32*)mso_sptDefault7200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextFadeUpHandle, sizeof( mso_sptTextFadeUpHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6297,7 +6302,7 @@
+ static const SvxMSDffHandle mso_sptTextFadeDownHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 21600, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x100, 21600, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoTextFadeDown =
+ {
+@@ -6307,7 +6312,7 @@
+     (sal_Int32*)mso_sptDefault7200,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextFadeDownHandle, sizeof( mso_sptTextFadeDownHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6319,7 +6324,7 @@
+ static const SvxMSDffHandle mso_sptTextSlantUpHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 15400 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 15400 }
+ };
+ static const mso_CustomShape msoTextSlantUp =
+ {
+@@ -6329,7 +6334,7 @@
+     (sal_Int32*)mso_sptDefault12000,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextSlantUpHandle, sizeof( mso_sptTextSlantUpHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6341,7 +6346,7 @@
+ static const SvxMSDffHandle mso_sptTextSlantDownHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 6200, 21600 }
+ };
+ static const mso_CustomShape msoTextSlantDown =
+ {
+@@ -6351,7 +6356,7 @@
+     (sal_Int32*)mso_sptDefault12000,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextSlantDownHandle, sizeof( mso_sptTextSlantDownHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6369,7 +6374,7 @@
+ static const SvxMSDffHandle mso_sptTextCascadeUpHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        21600, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
++        21600, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 6200, 21600 }
+ };
+ static const mso_CustomShape msoTextCascadeUp =
+ {
+@@ -6379,7 +6384,7 @@
+     (sal_Int32*)mso_sptDefault9600,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCascadeUpHandle, sizeof( mso_sptTextCascadeUpHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6391,7 +6396,7 @@
+ static const SvxMSDffHandle mso_sptTextCascadeDownHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 6200, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 6200, 21600 }
+ };
+ static const mso_CustomShape msoTextCascadeDown =
+ {
+@@ -6401,7 +6406,7 @@
+     (sal_Int32*)mso_sptDefault9600,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCascadeDownHandle, sizeof( mso_sptTextCascadeDownHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6425,7 +6430,7 @@
+ static const SvxMSDffHandle mso_sptTextArchUpCurveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR,
+-        10800, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        10800, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextArchUpCurveDefault[] =
+ {
+@@ -6439,7 +6444,7 @@
+     (sal_Int32*)mso_sptTextArchUpCurveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextArchUpCurveHandle, sizeof( mso_sptTextArchUpCurveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6455,7 +6460,7 @@
+ static const SvxMSDffHandle mso_sptTextArchDownCurveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR,
+-        10800, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        10800, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextArchDownCurveDefault[] =
+ {
+@@ -6469,7 +6474,7 @@
+     (sal_Int32*)mso_sptTextArchDownCurveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextArchDownCurveHandle, sizeof( mso_sptTextArchDownCurveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6493,7 +6498,7 @@
+ static const SvxMSDffHandle mso_sptTextCircleCurveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR,
+-        10800, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        10800, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextCircleCurveDefault[] =
+ {
+@@ -6507,7 +6512,7 @@
+     (sal_Int32*)mso_sptTextCircleCurveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCircleCurveHandle, sizeof( mso_sptTextCircleCurveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6536,7 +6541,7 @@
+ static const SvxMSDffHandle mso_sptTextButtonCurveHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR,
+-        10800, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        10800, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextButtonCurveDefault[] =
+ {
+@@ -6550,7 +6555,7 @@
+     (sal_Int32*)mso_sptTextButtonCurveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextButtonCurveHandle, sizeof( mso_sptTextButtonCurveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6582,7 +6587,7 @@
+ static const SvxMSDffHandle mso_sptTextArchPourHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        0x101, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x101, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextArchUpPourDefault[] =
+ {
+@@ -6596,7 +6601,7 @@
+     (sal_Int32*)mso_sptTextArchUpPourDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextArchPourHandle, sizeof( mso_sptTextArchPourHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6622,7 +6627,7 @@
+     (sal_Int32*)mso_sptTextArchDownPourDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextArchPourHandle, sizeof( mso_sptTextArchPourHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6655,7 +6660,7 @@
+ static const SvxMSDffHandle mso_sptTextCirclePourHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        0x101, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
++        0x101, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextCirclePourDefault[] =
+ {
+@@ -6669,7 +6674,7 @@
+     (sal_Int32*)mso_sptTextCirclePourDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCirclePourHandle, sizeof( mso_sptTextCirclePourHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6723,7 +6728,7 @@
+ static const SvxMSDffHandle mso_sptTextButtonPourHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
+-        0x101, 0x100, 10800, 10800, 4320, 10800, 0x80000000, 0x7fffffff }
++        0x101, 0x100, 10800, 10800, 4320, 10800, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_Int32 mso_sptTextButtonPourDefault[] =
+ {
+@@ -6737,7 +6742,7 @@
+     (sal_Int32*)mso_sptTextButtonPourDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextButtonPourHandle, sizeof( mso_sptTextButtonPourHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6763,7 +6768,7 @@
+ static const SvxMSDffHandle mso_sptTextCurveUpHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 12170 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 12170 }
+ };
+ static const sal_Int32 mso_sptTextCurveUpDefault[] =
+ {
+@@ -6777,7 +6782,7 @@
+     (sal_Int32*)mso_sptTextCurveUpDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCurveUpHandle, sizeof( mso_sptTextCurveUpHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6793,7 +6798,7 @@
+ static const SvxMSDffHandle mso_sptTextCurveDownHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        21600, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 12170 }
++        21600, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 12170 }
+ };
+ static const mso_CustomShape msoTextCurveDown =
+ {
+@@ -6803,7 +6808,7 @@
+     (sal_Int32*)mso_sptTextCurveUpDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCurveDownHandle, sizeof( mso_sptTextCurveDownHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6829,7 +6834,7 @@
+ static const SvxMSDffHandle mso_sptTextCanUpHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 14400, 21600 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 14400, 21600 }
+ };
+ static const sal_Int32 mso_sptTextCanUpDefault[] =
+ {
+@@ -6843,7 +6848,7 @@
+     (sal_Int32*)mso_sptTextCanUpDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCanUpHandle, sizeof( mso_sptTextCanUpHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6862,7 +6867,7 @@
+ static const SvxMSDffHandle mso_sptTextCanDownHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 7200 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 7200 }
+ };
+ static const sal_Int32 mso_sptTextCanDownDefault[] =
+ {
+@@ -6876,7 +6881,7 @@
+     (sal_Int32*)mso_sptTextCanDownDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextCanDownHandle, sizeof( mso_sptTextCanDownHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6896,7 +6901,7 @@
+ static const SvxMSDffHandle mso_sptTextInflateHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 4650 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 4650 }
+ };
+ static const sal_Int32 mso_sptTextInflateDefault[] =
+ {
+@@ -6910,7 +6915,7 @@
+     (sal_Int32*)mso_sptTextInflateDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextInflateHandle, sizeof( mso_sptTextInflateHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6930,7 +6935,7 @@
+ static const SvxMSDffHandle mso_sptTextDeflateHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 8100 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 8100 }
+ };
+ static const mso_CustomShape msoTextDeflate =
+ {
+@@ -6940,7 +6945,7 @@
+     (sal_Int32*)mso_sptDefault8100,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextDeflateHandle, sizeof( mso_sptTextDeflateHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -6965,7 +6970,7 @@
+ static const SvxMSDffHandle mso_sptTextInflateBottomHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 11150, 21600 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 11150, 21600 }
+ };
+ static const sal_Int32 mso_sptTextInflateBottomDefault[] =
+ {
+@@ -6979,7 +6984,7 @@
+     (sal_Int32*)mso_sptTextInflateBottomDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextInflateBottomHandle, sizeof( mso_sptTextInflateBottomHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7004,7 +7009,7 @@
+ static const SvxMSDffHandle mso_sptTextDeflateBottomHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 1350, 21600 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 1350, 21600 }
+ };
+ static const sal_Int32 mso_sptTextDeflateBottomDefault[] =
+ {
+@@ -7018,7 +7023,7 @@
+     (sal_Int32*)mso_sptTextDeflateBottomDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextDeflateBottomHandle, sizeof( mso_sptTextDeflateBottomHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7041,7 +7046,7 @@
+ static const SvxMSDffHandle mso_sptTextInflateTopHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10450 }
++        0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10450 }
+ };
+ static const sal_Int32 mso_sptTextInflateTopDefault[] =
+ {
+@@ -7055,7 +7060,7 @@
+     (sal_Int32*)mso_sptTextInflateTopDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextInflateTopHandle, sizeof( mso_sptTextInflateTopHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7078,7 +7083,7 @@
+ static const SvxMSDffHandle mso_sptTextDeflateTopHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 20250 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 20250 }
+ };
+ static const sal_Int32 mso_sptTextDeflateTopDefault[] =
+ {
+@@ -7092,7 +7097,7 @@
+     (sal_Int32*)mso_sptTextDeflateTopDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextDeflateTopHandle, sizeof( mso_sptTextDeflateTopHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7124,7 +7129,7 @@
+ static const SvxMSDffHandle mso_sptTextDeflateInflateHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 1300, 20300 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 1300, 20300 }
+ };
+ static const sal_Int32 mso_sptTextDeflateInflateDefault[] =
+ {
+@@ -7138,7 +7143,7 @@
+     (sal_Int32*)mso_sptTextDeflateInflateDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextDeflateInflateHandle, sizeof( mso_sptTextDeflateInflateHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7178,7 +7183,7 @@
+ static const SvxMSDffHandle mso_sptTextDeflateInflateDeflateHandle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 850, 9550 }
++        10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 850, 9550 }
+ };
+ static const sal_Int32 mso_sptTextDeflateInflateDeflateDefault[] =
+ {
+@@ -7192,7 +7197,7 @@
+     (sal_Int32*)mso_sptTextDeflateInflateDeflateDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptTextDeflateInflateDeflateHandle, sizeof( mso_sptTextDeflateInflateDeflateHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7215,7 +7220,7 @@
+     (sal_Int32*)mso_sptWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptWaveGluePoints, sizeof( mso_sptWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptWaveHandle, sizeof( mso_sptWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7233,7 +7238,7 @@
+     (sal_Int32*)mso_sptWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptWaveGluePoints, sizeof( mso_sptWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptWaveHandle, sizeof( mso_sptWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7256,7 +7261,7 @@
+     (sal_Int32*)mso_sptDoubleWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, sizeof( mso_sptDoubleWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, sizeof( mso_sptDoubleWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptDoubleWaveHandle, sizeof( mso_sptDoubleWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7274,7 +7279,7 @@
+     (sal_Int32*)mso_sptDoubleWaveDefault,
+     (SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, sizeof( mso_sptDoubleWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     (SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, sizeof( mso_sptDoubleWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
+     (SvxMSDffHandle*)mso_sptDoubleWaveHandle, sizeof( mso_sptDoubleWaveHandle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7302,9 +7307,9 @@
+ static const SvxMSDffHandle mso_sptCalloutHandle1[] =
+ {
+     {   0,
+-        0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x100, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x102, 0x103, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
++        0x102, 0x103, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_uInt16 mso_sptCalloutSegm1a[] =
+ {
+@@ -7343,11 +7348,11 @@
+ static const SvxMSDffHandle mso_sptCalloutHandle2[] =
+ {
+     {   0,
+-        0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x100, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x102, 0x103, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x102, 0x103, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x104, 0x105, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
++        0x104, 0x105, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_uInt16 mso_sptCallout2Segm1a[] =
+ {
+@@ -7390,13 +7395,13 @@
+ static const SvxMSDffHandle mso_sptCalloutHandle3[] =
+ {
+     {   0,
+-        0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x100, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x102, 0x103, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x102, 0x103, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x104, 0x105, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff },
++        0x104, 0x105, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff },
+     {   0,
+-        0x106, 0x107, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
++        0x106, 0x107, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff }
+ };
+ static const sal_uInt16 mso_sptCallout3Segm1a[] =
+ {
+@@ -7441,7 +7446,7 @@
+     (sal_Int32*)mso_sptCalloutDefault1,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7453,7 +7458,7 @@
+     (sal_Int32*)mso_sptCalloutDefault2,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7465,7 +7470,7 @@
+     (sal_Int32*)mso_sptCalloutDefault3,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7477,7 +7482,7 @@
+     (sal_Int32*)mso_sptCalloutDefault4,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7489,7 +7494,7 @@
+     (sal_Int32*)mso_sptCalloutDefault1,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7501,7 +7506,7 @@
+     (sal_Int32*)mso_sptCalloutDefault2,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7513,7 +7518,7 @@
+     (sal_Int32*)mso_sptCalloutDefault3,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7525,7 +7530,7 @@
+     (sal_Int32*)mso_sptCalloutDefault4,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7537,7 +7542,7 @@
+     (sal_Int32*)mso_sptCalloutDefault1,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7549,7 +7554,7 @@
+     (sal_Int32*)mso_sptCalloutDefault2,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7561,7 +7566,7 @@
+     (sal_Int32*)mso_sptCalloutDefault3,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7573,7 +7578,7 @@
+     (sal_Int32*)mso_sptCalloutDefault4,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7585,7 +7590,7 @@
+     (sal_Int32*)mso_sptCalloutDefault1,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7597,7 +7602,7 @@
+     (sal_Int32*)mso_sptCalloutDefault2,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle1, sizeof( mso_sptCalloutHandle1 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7609,7 +7614,7 @@
+     (sal_Int32*)mso_sptCalloutDefault3,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle2, sizeof( mso_sptCalloutHandle2 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7621,7 +7626,7 @@
+     (sal_Int32*)mso_sptCalloutDefault4,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCalloutHandle3, sizeof( mso_sptCalloutHandle3 ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7642,7 +7647,7 @@
+     (sal_Int32*)NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)NULL, 0
+ };
+@@ -7663,7 +7668,7 @@
+     (sal_Int32*)NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)NULL, 0
+ };
+@@ -7687,7 +7692,7 @@
+ static const SvxMSDffHandle mso_sptBentConnector3Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBentConnector3 =
+ {
+@@ -7697,7 +7702,7 @@
+     (sal_Int32*)mso_sptBentConnector3Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBentConnector3Handle, sizeof( mso_sptBentConnector3Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7725,9 +7730,9 @@
+ static const SvxMSDffHandle mso_sptBentConnector4Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x100, 4 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 4 + 3, 4 + 3 },
++        0x100, 4 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 4 + 3, 4 + 3 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, 0x80000000, 0x7fffffff }
++        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoBentConnector4 =
+ {
+@@ -7737,7 +7742,7 @@
+     (sal_Int32*)mso_sptBentConnector4Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBentConnector4Handle, sizeof( mso_sptBentConnector4Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7768,11 +7773,11 @@
+ static const SvxMSDffHandle mso_sptBentConnector5Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x100, 5 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 5 + 3, 5 + 3 },
++        0x100, 5 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 5 + 3, 5 + 3 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, 0x80000000, 0x7fffffff },
++        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x102, 7 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 7 + 3, 7 + 3 }
++        0x102, 7 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 7 + 3, 7 + 3 }
+ };
+ static const mso_CustomShape msoBentConnector5 =
+ {
+@@ -7782,7 +7787,7 @@
+     (sal_Int32*)mso_sptBentConnector5Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptBentConnector5Handle, sizeof( mso_sptBentConnector5Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7803,7 +7808,7 @@
+     (sal_Int32*)NULL,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)NULL, 0
+ };
+@@ -7830,7 +7835,7 @@
+ static const SvxMSDffHandle mso_sptCurvedConnector3Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE,
+-        0x100, 10800, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff }
++        0x100, 10800, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoCurvedConnector3 =
+ {
+@@ -7840,7 +7845,7 @@
+     (sal_Int32*)mso_sptCurvedConnector3Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCurvedConnector3Handle, sizeof( mso_sptCurvedConnector3Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7881,9 +7886,9 @@
+ static const SvxMSDffHandle mso_sptCurvedConnector4Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x100, 9 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 9 + 3, 9 + 3 },
++        0x100, 9 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 9 + 3, 9 + 3 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, 0x80000000, 0x7fffffff }
++        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, MIN_INT32, 0x7fffffff }
+ };
+ static const mso_CustomShape msoCurvedConnector4 =
+ {
+@@ -7893,7 +7898,7 @@
+     (sal_Int32*)mso_sptCurvedConnector4Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCurvedConnector4Handle, sizeof( mso_sptCurvedConnector4Handle ) / sizeof( SvxMSDffHandle )
+ };
+@@ -7942,11 +7947,11 @@
+ static const SvxMSDffHandle mso_sptCurvedConnector5Handle[] =
+ {
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x100, 11 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 11 + 3, 11 + 3 },
++        0x100, 11 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 11 + 3, 11 + 3 },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
+-        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, 0x80000000, 0x7fffffff },
++        3 + 3, 0x101, 10800, 10800, 3 + 3, 3 + 3, MIN_INT32, 0x7fffffff },
+     {   MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
+-        0x102, 16 + 3, 10800, 10800, 0x80000000, 0x7fffffff, 16 + 3, 16 + 3 }
++        0x102, 16 + 3, 10800, 10800, MIN_INT32, 0x7fffffff, 16 + 3, 16 + 3 }
+ };
+ static const mso_CustomShape msoCurvedConnector5 =
+ {
+@@ -7956,7 +7961,7 @@
+     (sal_Int32*)mso_sptCurvedConnector5Default,
+     NULL, 0,
+     21600, 21600,
+-    0x80000000, 0x80000000,
++    MIN_INT32, MIN_INT32,
+     NULL, 0,
+     (SvxMSDffHandle*)mso_sptCurvedConnector5Handle, sizeof( mso_sptCurvedConnector5Handle ) / sizeof( SvxMSDffHandle )
+ };
diff --git a/editors/libreoffice/files/patch-sw__Module_sw.mk b/editors/libreoffice/files/patch-sw__Module_sw.mk
new file mode 100644
index 000000000000..deed7ebfebf2
--- /dev/null
+++ b/editors/libreoffice/files/patch-sw__Module_sw.mk
@@ -0,0 +1,15 @@
+--- ./sw/Module_sw.mk.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./sw/Module_sw.mk	2012-04-16 14:24:48.000000000 +0200
+@@ -40,12 +40,6 @@
+     Package_xml \
+ ))
+ 
+-$(eval $(call gb_Module_add_check_targets,sw,\
+-    CppunitTest_sw_filters_test \
+-    CppunitTest_sw_macros_test \
+-    CppunitTest_sw_swdoc_test \
+-))
+-
+ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
+     JunitTest_sw_complex \
+     JunitTest_sw_unoapi \
diff --git a/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk b/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk
new file mode 100644
index 000000000000..153523d9f2ca
--- /dev/null
+++ b/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk
@@ -0,0 +1,11 @@
+--- ./testtools/source/bridgetest/makefile.mk.orig	2012-04-17 11:41:16.000000000 +0200
++++ ./testtools/source/bridgetest/makefile.mk	2012-04-17 11:41:53.000000000 +0200
+@@ -56,6 +56,8 @@
+ my_components += testComponent
+ .END
+ 
++CFLAGSCXX += -fPIC
++
+ .IF "$(GUI)"=="WNT"
+ .IF "$(compcheck)" != ""
+ CFLAGSCXX += -DCOMPCHECK
diff --git a/editors/libreoffice/files/patch-toolkit__source__awt__animatedimagespeer.cxx b/editors/libreoffice/files/patch-toolkit__source__awt__animatedimagespeer.cxx
new file mode 100644
index 000000000000..7f1cde9e3f84
--- /dev/null
+++ b/editors/libreoffice/files/patch-toolkit__source__awt__animatedimagespeer.cxx
@@ -0,0 +1,11 @@
+--- ./toolkit/source/awt/animatedimagespeer.cxx.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./toolkit/source/awt/animatedimagespeer.cxx	2012-04-16 15:40:08.000000000 +0200
+@@ -219,7 +219,7 @@
+                             ||  ( !lcl_ensureImage_throw( xGraphicProvider, isHighContrast, rImageSet[0] ) )
+                             )
+                         {
+-                            aImageSizes[ nImageSet ] = Size( ::std::numeric_limits< long >::max(), ::std::numeric_limits< long >::max() );
++                            aImageSizes[ nImageSet ] = Size( SAL_MAX_INT32, SAL_MAX_INT32 );
+                         }
+                         else
+                         {
diff --git a/editors/libreoffice/files/patch-vcl__unx__generic__app__wmadaptor.cxx b/editors/libreoffice/files/patch-vcl__unx__generic__app__wmadaptor.cxx
new file mode 100644
index 000000000000..eea98d5a5907
--- /dev/null
+++ b/editors/libreoffice/files/patch-vcl__unx__generic__app__wmadaptor.cxx
@@ -0,0 +1,11 @@
+--- ./vcl/unx/generic/app/wmadaptor.cxx.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./vcl/unx/generic/app/wmadaptor.cxx	2012-04-16 14:24:48.000000000 +0200
+@@ -2404,7 +2404,7 @@
+ void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
+ {
+     rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
+-    XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, aWmClient.getLength() };
++    XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, static_cast<unsigned long>(aWmClient.getLength()) };
+     XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp );
+ }
+ 
diff --git a/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx
new file mode 100644
index 000000000000..cc7ee34763be
--- /dev/null
+++ b/editors/libreoffice/files/patch-vcl__unx__gtk__gdi__salnativewidgets-gtk.cxx
@@ -0,0 +1,11 @@
+--- ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2012-04-16 14:24:48.000000000 +0200
+@@ -3688,7 +3688,7 @@
+     aStyleSet.SetPreferredSymbolsStyleName( OUString::createFromAscii( pIconThemeName ) );
+     g_free( pIconThemeName );
+ 
+-    aStyleSet.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
++    aStyleSet.SetToolbarIconSize( nDispDPIY > 160 ? STYLE_TOOLBAR_ICONSIZE_LARGE : STYLE_TOOLBAR_ICONSIZE_SMALL );
+ 
+     const cairo_font_options_t* pNewOptions = NULL;
+ #if !GTK_CHECK_VERSION(2,9,0)
diff --git a/editors/libreoffice/files/patch-writerfilter__source__dmapper__ConversionHelper.cxx b/editors/libreoffice/files/patch-writerfilter__source__dmapper__ConversionHelper.cxx
new file mode 100644
index 000000000000..92cdf20609e1
--- /dev/null
+++ b/editors/libreoffice/files/patch-writerfilter__source__dmapper__ConversionHelper.cxx
@@ -0,0 +1,11 @@
+--- ./writerfilter/source/dmapper/ConversionHelper.cxx.orig	2012-03-27 18:22:01.000000000 +0200
++++ ./writerfilter/source/dmapper/ConversionHelper.cxx	2012-04-16 14:24:48.000000000 +0200
+@@ -131,7 +131,7 @@
+ {
+     static const sal_Int32 aBorderDefColor[] =
+     {
+-        COL_AUTO, COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN,
++        static_cast<sal_Int32>(COL_AUTO), COL_BLACK, COL_LIGHTBLUE, COL_LIGHTCYAN, COL_LIGHTGREEN,
+         COL_LIGHTMAGENTA, COL_LIGHTRED, COL_YELLOW, COL_WHITE, COL_BLUE,
+         COL_CYAN, COL_GREEN, COL_MAGENTA, COL_RED, COL_BROWN, COL_GRAY,
+         COL_LIGHTGRAY
diff --git a/editors/libreoffice/files/patch__solenv__gbuild__platform__com_GCC_defs.mk b/editors/libreoffice/files/patch__solenv__gbuild__platform__com_GCC_defs.mk
new file mode 100644
index 000000000000..f4b93931dd64
--- /dev/null
+++ b/editors/libreoffice/files/patch__solenv__gbuild__platform__com_GCC_defs.mk
@@ -0,0 +1,18 @@
+--- solenv/gbuild/platform/com_GCC_defs.mk.orig	2012-02-01 13:56:49.000000000 +0100
++++ solenv/gbuild/platform/com_GCC_defs.mk	2012-03-01 08:38:34.634457577 +0100
+@@ -113,8 +113,13 @@
+ 
+ gb_LinkTarget_EXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_ON \
+-	-fexceptions \
+-	-fno-enforce-eh-specs \
++	-fexceptions
++
++# Clang doesn't have this option
++ifeq (,$(findstring /clang,$(CXX)))
++gb_LinkTarget_EXCEPTIONFLAGS += \
++	-fno-enforce-eh-specs
++endif
+ 
+ gb_LinkTarget_NOEXCEPTIONFLAGS := \
+ 	-DEXCEPTIONS_OFF \
author	Baptiste Daroussin <bapt@FreeBSD.org>	2012-04-22 20:38:32 +0000
committer	Baptiste Daroussin <bapt@FreeBSD.org>	2012-04-22 20:38:32 +0000
commit	8269acc5cea14fd90a0997cd287caa5b4fa52638 (patch)
tree	68434c0582718bc0b7d23867bb335c9e9d01f1ea /editors/libreoffice
parent	d25e12e5390827169c65739d195d68b0e220e1f3 (diff)
download	ports-8269acc5cea14fd90a0997cd287caa5b4fa52638.tar.gz ports-8269acc5cea14fd90a0997cd287caa5b4fa52638.zip