diff -Nur libreoffice/Makefile.orig libreoffice/Makefile --- libreoffice/Makefile.orig 2013-12-28 07:37:24.868110860 +0900 +++ libreoffice/Makefile 2014-01-30 16:30:26.789117209 +0900 @@ -1,4 +1,4 @@ -# $FreeBSD: head/editors/libreoffice/Makefile 337749 2013-12-27 16:54:21Z kwm $ +# $FreeBSD: editors/libreoffice/Makefile 607 2014-01-30 07:30:26Z $ .include "${.CURDIR}/Makefile.common" @@ -7,6 +7,7 @@ COMMENT= Full integrated office productivity suite BUILD_DEPENDS= p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \ + gtar:${PORTSDIR}/archivers/gtar \ unzip:${PORTSDIR}/archivers/unzip \ zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs \ @@ -38,6 +39,7 @@ libnss3.so:${PORTSDIR}/security/nss \ libclucene-core.so:${PORTSDIR}/textproc/clucene \ libexpat.so:${PORTSDIR}/textproc/expat2 \ + libharfbuzz.so:${PORTSDIR}/print/harfbuzz \ libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \ libhyphen.so:${PORTSDIR}/textproc/hyphen \ libexttextcat-2.0.so:${PORTSDIR}/textproc/libexttextcat \ @@ -75,7 +77,9 @@ EXTRACT_ONLY:= ${DISTFILES} -DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src +DISTFILES+= 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz:src \ + libmwaw-0.1.11.tar.bz2:src \ + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2:src DIST_SUBDIR= libreoffice LODESTDIR= ${WRKDIR}/loinstall @@ -124,6 +128,7 @@ --with-system-dicts \ --with-system-expat \ --with-system-graphite \ + --with-system-harfbuzz \ --with-system-hunspell \ --with-system-icu \ --with-system-jpeg \ diff -Nur libreoffice/Makefile.common.orig libreoffice/Makefile.common --- libreoffice/Makefile.common.orig 2014-01-23 07:05:09.794700481 +0900 +++ libreoffice/Makefile.common 2014-01-30 12:10:16.972192724 +0900 @@ -1,7 +1,7 @@ -# $FreeBSD: head/editors/libreoffice/Makefile.common 340722 2014-01-22 17:00:46Z mat $ +# $FreeBSD: editors/libreoffice/Makefile.common 602 2014-01-30 03:10:16Z $ PORTNAME= libreoffice -PORTVERSION= 4.0.6 +PORTVERSION= 4.1.4 RCVER= 2 #PRERELEASE= yes LOVERSION= ${PORTVERSION}.${RCVER} diff -Nur libreoffice/distinfo.orig libreoffice/distinfo --- libreoffice/distinfo.orig 2014-01-23 07:05:09.206813669 +0900 +++ libreoffice/distinfo 2014-01-30 15:39:04.895330165 +0900 @@ -1,9 +1,13 @@ -SHA256 (libreoffice/libreoffice-4.0.6.2.tar.xz) = 6cd52fb18c5885eeaac921d4c54c3865df58ef20a91b505c61471fdf56a25474 -SIZE (libreoffice/libreoffice-4.0.6.2.tar.xz) = 104753440 -SHA256 (libreoffice/libreoffice-help-4.0.6.2.tar.xz) = f73a53525162df4099e71cc1095df30f39ebcf3ba3683b639446838a5f8784e2 -SIZE (libreoffice/libreoffice-help-4.0.6.2.tar.xz) = 1858200 +SHA256 (libreoffice/libreoffice-4.1.4.2.tar.xz) = 18bff8f45919c5e4be3b3355086b2f2336cc42263312f5b420be8d61daceb0bb +SIZE (libreoffice/libreoffice-4.1.4.2.tar.xz) = 121954220 +SHA256 (libreoffice/libreoffice-help-4.1.4.2.tar.xz) = 1e33b1b9626045c26fda9ad50cb03405fb00967375af05d28fa24e98e790c15c +SIZE (libreoffice/libreoffice-help-4.1.4.2.tar.xz) = 1849668 SHA256 (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SIZE (libreoffice/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz) = 1652670 +SHA256 (libreoffice/libmwaw-0.1.11.tar.bz2) = a350979a9bbcb7202a2e3b4d454674f97be70ae35efe35a53f80bba28b819ff2 +SIZE (libreoffice/libmwaw-0.1.11.tar.bz2) = 908235 +SHA256 (libreoffice/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2) = 088940696f15fd8962bded2be7a996f1f005779936d6f0ac74793799f1c921f8 +SIZE (libreoffice/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2) = 334207 SHA256 (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SIZE (libreoffice/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip) = 3519470 SHA256 (libreoffice/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz) = 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4 diff -Nur libreoffice/files/extra-patch-libc++.orig libreoffice/files/extra-patch-libc++ --- libreoffice/files/extra-patch-libc++.orig 2013-10-15 10:45:07.616155765 +0900 +++ libreoffice/files/extra-patch-libc++ 2014-01-29 15:51:24.199233411 +0900 @@ -450,19 +450,8 @@ // temporary params for ( ; nTempIndizes--; ) ---- sal/inc/rtl/allocator.hxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sal/inc/rtl/allocator.hxx 2013-09-12 16:56:43.000000000 -0400 -@@ -125,7 +125,7 @@ - } - - //----------------------------------------- --#if defined HAVE_CXX11_PERFECT_FORWARDING -+#if defined(HAVE_CXX11_PERFECT_FORWARDING) && !defined(_LIBCPP_VERSION) - template< typename... Args > - void construct (pointer p, Args &&... value) - { ---- sal/inc/sal/log.hxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sal/inc/sal/log.hxx 2013-09-13 05:27:31.000000000 -0400 +--- include/sal/log.hxx.orig 2013-08-13 16:11:48.000000000 -0400 ++++ include/sal/log.hxx 2013-09-13 05:27:31.000000000 -0400 @@ -177,9 +177,13 @@ @since LibreOffice 3.5 diff -Nur libreoffice/files/patch-bin__distro-install-desktop-integration.orig libreoffice/files/patch-bin__distro-install-desktop-integration --- libreoffice/files/patch-bin__distro-install-desktop-integration.orig 2014-01-23 07:05:09.250899104 +0900 +++ libreoffice/files/patch-bin__distro-install-desktop-integration 2014-01-30 16:11:18.774196887 +0900 @@ -1,13 +1,13 @@ ---- ./bin/distro-install-desktop-integration.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./bin/distro-install-desktop-integration 2013-02-18 18:38:28.000000000 -0500 +--- bin/distro-install-desktop-integration.orig 2013-12-11 01:11:21.000000000 +0900 ++++ bin/distro-install-desktop-integration 2014-01-29 16:00:32.000000000 +0900 @@ -94,13 +94,13 @@ } # install desktop integration from plain packages -sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` --cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" +sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` -+cp -a sysui/unx*/misc/libreoffice/* "$sysui_temp" +-cp -a workdir/unxlng*/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" ++cp -a ../workdir/unx*/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" builddir=`pwd` cd $sysui_temp @@ -17,7 +17,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -114,16 +114,17 @@ +@@ -114,8 +114,9 @@ export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export GNOMEDIR=$PREFIXDIR @@ -28,17 +28,7 @@ ) cd - rm -rf $sysui_temp - - # we do not want some stuff from the plain packages - 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 - rm -f $DESTDIR/opt/$INSTALLDIRNAME - rmdir --ignore-fail-on-non-empty $DESTDIR/opt -@@ -132,7 +133,7 @@ +@@ -131,7 +132,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -47,7 +37,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -147,7 +148,7 @@ +@@ -146,7 +148,7 @@ $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do diff -Nur libreoffice/files/patch-bridges__Library_cpp_uno.mk.orig libreoffice/files/patch-bridges__Library_cpp_uno.mk --- libreoffice/files/patch-bridges__Library_cpp_uno.mk.orig 1970-01-01 09:00:00.000000000 +0900 +++ libreoffice/files/patch-bridges__Library_cpp_uno.mk 2014-01-29 16:14:02.000000000 +0900 @@ -0,0 +1,11 @@ +--- bridges/Library_cpp_uno.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ bridges/Library_cpp_uno.mk 2014-01-29 16:13:21.000000000 +0900 +@@ -188,7 +188,7 @@ + $(if $(filter TRUE,$(HAVE_GCC_AVX)),-mno-avx) \ + )) + +-ifeq ($(filter ANDROID WNT,$(OS)),) ++ifeq ($(filter ANDROID WNT DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) + $(eval $(call gb_Library_add_libs,gcc3_uno,\ + -ldl \ + )) diff -Nur libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk.orig libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk --- libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk.orig 2013-03-09 19:39:58.825213919 +0900 +++ libreoffice/files/patch-bridges__Library_gcc3_linux_intel.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./bridges/Library_gcc3_linux_intel.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./bridges/Library_gcc3_linux_intel.mk 2013-02-19 20:22:56.000000000 -0500 -@@ -39,7 +39,7 @@ - ) \ - )) - --ifneq ($(OS),ANDROID) -+ifeq ($(filter ANDROID DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) - $(eval $(call gb_Library_add_libs,gcc3_uno,\ - -ldl \ - )) diff -Nur libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk.orig libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk --- libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk.orig 2013-03-09 19:39:58.808213104 +0900 +++ libreoffice/files/patch-bridges__Library_gcc3_linux_x86-64.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,14 +0,0 @@ ---- ./bridges/Library_gcc3_linux_x86-64.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./bridges/Library_gcc3_linux_x86-64.mk 2013-02-19 17:34:24.000000000 -0500 -@@ -41,9 +41,11 @@ - ) \ - )) - -+ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD MACOSX,$(OS)),) - $(eval $(call gb_Library_add_libs,gcc3_uno,\ - -ldl \ - )) -+endif - - $(eval $(call gb_Library_use_libraries,gcc3_uno,\ - cppu \ diff -Nur libreoffice/files/patch-configure.ac.orig libreoffice/files/patch-configure.ac --- libreoffice/files/patch-configure.ac.orig 2013-09-19 09:44:51.426777343 +0900 +++ libreoffice/files/patch-configure.ac 2014-01-29 17:21:05.077863467 +0900 @@ -1,6 +1,6 @@ ---- configure.ac.orig 2013-08-13 16:11:48.000000000 -0400 -+++ configure.ac 2013-09-13 17:50:41.000000000 -0400 -@@ -3637,7 +3637,7 @@ +--- configure.ac.orig 2014-01-29 16:19:43.000000000 +0900 ++++ configure.ac 2014-01-29 16:46:07.000000000 +0900 +@@ -3586,7 +3586,7 @@ PLATFORMID=freebsd_x86 OUTPATH=unxfbsdi ;; @@ -9,7 +9,7 @@ CPU=X CPUNAME=X86_64 RTL_ARCH=X86_64 -@@ -6281,21 +6281,13 @@ +@@ -6541,21 +6541,13 @@ JAVA_ARCH="i386" JAVA_TOOLKIT="client" ;; @@ -26,24 +26,24 @@ + JAVA_TOOLKIT="server" ;; esac - SOLARINC="$SOLARINC -I$JAVA_HOME/include" - SOLARINC="$SOLARINC -I$JAVA_HOME/include/freebsd" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/bsd" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/linux" -- SOLARINC="$SOLARINC -I$JAVA_HOME/include/native_threads/include" + JAVAINC="-I$JAVA_HOME/include" + JAVAINC="$JAVAINC -I$JAVA_HOME/include/freebsd" +- JAVAINC="$JAVAINC -I$JAVA_HOME/include/bsd" +- JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" +- test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; k*bsd*-gnu*) -@@ -6978,7 +6970,7 @@ - if test "$with_system_libcmis" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_LIBCMIS=YES -- PKG_CHECK_MODULES( CMIS, libcmis-0.3 >= 0.3.1 ) -+ PKG_CHECK_MODULES( CMIS, libcmis-0.4 >= 0.4.1 ) - else - AC_MSG_RESULT([internal]) - SYSTEM_LIBCMIS=NO -@@ -8298,7 +8290,7 @@ +@@ -7222,7 +7214,7 @@ + dnl =================================================================== + dnl Check for system libcmis + dnl =================================================================== +-libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 >= 0.3.1]) ++libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.4 >= 0.4.1]) + + dnl =================================================================== + dnl Check for system libwpd +@@ -8416,7 +8408,7 @@ dnl =================================================================== AC_MSG_CHECKING([whether to enable graphite support]) @@ -51,28 +51,17 @@ +if test "$_os" = "WINNT" -o "$_os" = "Linux" -o "$_os" = "FreeBSD" && test "$enable_graphite" = "" -o "$enable_graphite" != "no"; then AC_MSG_RESULT([yes]) ENABLE_GRAPHITE="TRUE" - AC_MSG_CHECKING([which graphite to use]) -@@ -8550,8 +8542,8 @@ - AC_MSG_RESULT([external]) - # Mac OS builds should get out without extra stuff is the Mac porters' - # wish. And pkg-config is although Xcode ships a .pc for openssl -- if test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ -- "$_os" = "DragonFly"; then -+ if test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \ -+ "$_os" = "OpenBSD" -o "$_os" = "DragonFly"; then - OPENSSL_CFLAGS= - OPENSSL_LIBS="-lssl -lcrypto" - else -@@ -8605,7 +8597,7 @@ - if test "$with_system_orcus" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_LIBORCUS=YES -- PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0) -+ PKG_CHECK_MODULES(ORCUS, liborcus-0.6 >= 0.5.0) - else - AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE ORCUS" -@@ -10419,10 +10411,10 @@ + AC_DEFINE(ENABLE_GRAPHITE) +@@ -8641,7 +8633,7 @@ + + with_system_openssl=no + libo_CHECK_SYSTEM_MODULE([openssl],[OPENSSL],[openssl]) +- elif test "$_os" = "Darwin" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ ++ elif test "$_os" = "Darwin" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o "$_os" = "OpenBSD" -o \ + "$_os" = "DragonFly" && test "$with_system_openssl" != "no"; then + # Mac OS builds should get out without extra stuff is the Mac porters' + # wish. And pkg-config is although Xcode ships a .pc for openssl +@@ -10472,10 +10464,10 @@ dnl Check for Meta Object Compiler diff -Nur libreoffice/files/patch-connectivity__source__inc__dbase__dindexnode.hxx.orig libreoffice/files/patch-connectivity__source__inc__dbase__dindexnode.hxx --- libreoffice/files/patch-connectivity__source__inc__dbase__dindexnode.hxx.orig 2013-06-26 09:20:02.645413528 +0900 +++ libreoffice/files/patch-connectivity__source__inc__dbase__dindexnode.hxx 2014-01-29 18:13:41.059646456 +0900 @@ -1,13 +1,14 @@ ---- connectivity/source/inc/dbase/dindexnode.hxx.orig 2013-06-11 05:33:38.000000000 -0400 -+++ connectivity/source/inc/dbase/dindexnode.hxx 2013-06-25 13:44:38.000000000 -0400 -@@ -26,7 +26,11 @@ +--- connectivity/source/inc/dbase/dindexnode.hxx.orig 2013-12-11 01:11:21.000000000 +0900 ++++ connectivity/source/inc/dbase/dindexnode.hxx 2014-01-29 16:48:39.000000000 +0900 +@@ -26,7 +26,12 @@ #include #define NODE_NOTFOUND 0xFFFF +#ifdef __FreeBSD__ +#include ++#define DINDEX_PAGE_SIZE PAGE_SIZE +#else - #define PAGE_SIZE 512 + #define DINDEX_PAGE_SIZE 512 +#endif namespace connectivity diff -Nur libreoffice/files/patch-extensions__Library_ldapbe2.mk.orig libreoffice/files/patch-extensions__Library_ldapbe2.mk --- libreoffice/files/patch-extensions__Library_ldapbe2.mk.orig 2013-03-09 19:39:58.824215050 +0900 +++ libreoffice/files/patch-extensions__Library_ldapbe2.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,23 +0,0 @@ ---- ./extensions/Library_ldapbe2.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./extensions/Library_ldapbe2.mk 2013-02-19 17:56:48.000000000 -0500 -@@ -58,16 +58,10 @@ - wldap32 \ - )) - else # 0S!=WNT --$(eval $(call gb_Library_use_externals,ldapbe2,openldap)) -- --$(eval $(call gb_Library_add_libs,ldapbe2,\ -- -lssl3 \ -- -lsmime3 \ -- -lnss3 \ -- -lnssutil3 \ -- -lplds4 \ -- -lplc4 \ -- -lnspr4 \ -+$(eval $(call gb_Library_use_externals,ldapbe2,\ -+ nss3 \ -+ openldap \ -+ plc4 \ - )) - endif - diff -Nur libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk.orig libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk --- libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk.orig 2013-03-09 19:39:58.815213083 +0900 +++ libreoffice/files/patch-i18npool__CustomTarget_breakiterator.mk 2014-01-29 16:54:44.000000000 +0900 @@ -1,11 +1,11 @@ ---- ./i18npool/CustomTarget_breakiterator.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./i18npool/CustomTarget_breakiterator.mk 2013-02-22 15:26:45.000000000 -0500 -@@ -120,7 +120,7 @@ +--- i18npool/CustomTarget_breakiterator.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ i18npool/CustomTarget_breakiterator.mk 2014-01-29 16:54:14.000000000 +0900 +@@ -77,7 +77,7 @@ # sed substitution... $(i18npool_BIDIR)/%.txt : \ $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir - sed -e ': dummy' \ + $(SED) -e ': dummy' \ - -e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#" \ + $(if $(filter YES,$(ICU_RECLASSIFIED_CLOSE_PARENTHESIS)),-e "s#\[:LineBreak = Close_Punctuation:\]#\[& \[:LineBreak = Close_Parenthesis:\]\]#") \ $(if $(filter-out YES,$(ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER)),\ -e '/\[:LineBreak = Conditional_Japanese_Starter:\]/d' \ diff -Nur libreoffice/files/patch-liborcus-0.5.x.orig libreoffice/files/patch-liborcus-0.5.x --- libreoffice/files/patch-liborcus-0.5.x.orig 2013-06-26 09:20:02.645413528 +0900 +++ libreoffice/files/patch-liborcus-0.5.x 1970-01-01 09:00:00.000000000 +0900 @@ -1,540 +0,0 @@ ---- sc/inc/document.hxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/inc/document.hxx 2013-06-24 19:08:23.000000000 -0400 -@@ -750,6 +750,7 @@ - SC_DLLPUBLIC bool SetString( - SCCOL nCol, SCROW nRow, SCTAB nTab, const rtl::OUString& rString, - ScSetStringParam* pParam = NULL ); -+ SC_DLLPUBLIC bool SetString( const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam = NULL ); - SC_DLLPUBLIC void SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ); - void SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const sal_uInt16 nError); - ---- sc/inc/orcusfilters.hxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/inc/orcusfilters.hxx 2013-06-24 19:08:23.000000000 -0400 -@@ -30,6 +30,10 @@ - - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; - -+ virtual bool importXLSX(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; -+ -+ virtual bool importODS(ScDocument& rDoc, const rtl::OUString& rPath) const = 0; -+ - /** - * Create a context for XML file. The context object stores session - * information for each unique XML file. You must create a new context ---- sc/inc/stringutil.hxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/inc/stringutil.hxx 2013-06-24 19:08:23.000000000 -0400 -@@ -72,16 +72,26 @@ - TextFormatPolicy meSetTextNumFormat; - - /** -- * When true, treat input with a leading apostrophe / single quote special -- * in that it escapes numeric or date/time input such that it is not -- * interpreted and the input string is taken instead. This can be used -- * during text file import so the leading apostrophe is not lost if it -- * precedes a numeric value. -- * Usually set mbHandleApostrophe = !mbSetTextCellFormat -+ * When true, treat input with a leading apostrophe as an escape character -+ * for a numeric value content, to treat the numeric value as a text. When -+ * false, the whole string input including the leading apostrophe will be -+ * entered literally as string. - */ - bool mbHandleApostrophe; - - ScSetStringParam(); -+ -+ /** -+ * Call this whenever you need to unconditionally set input as text, no -+ * matter what the input is. -+ */ -+ void setTextInput(); -+ -+ /** -+ * Call this whenever you need to maximize the chance of input being -+ * detected as a numeric value (numbers, dates, times etc). -+ */ -+ void setNumericInput(); - }; - - // ============================================================================ ---- sc/source/core/data/document.cxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/core/data/document.cxx 2013-06-24 19:08:23.000000000 -0400 -@@ -2940,6 +2940,12 @@ - return false; - } - -+bool ScDocument::SetString( -+ const ScAddress& rPos, const OUString& rString, ScSetStringParam* pParam ) -+{ -+ return SetString(rPos.Col(), rPos.Row(), rPos.Tab(), rString, pParam); -+} -+ - - void ScDocument::SetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rVal ) - { ---- sc/source/core/tool/stringutil.cxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/core/tool/stringutil.cxx 2013-06-24 19:08:23.000000000 -0400 -@@ -32,6 +32,20 @@ - { - } - -+void ScSetStringParam::setTextInput() -+{ -+ mbDetectNumberFormat = false; -+ mbHandleApostrophe = false; -+ meSetTextNumFormat = Always; -+} -+ -+void ScSetStringParam::setNumericInput() -+{ -+ mbDetectNumberFormat = true; -+ mbHandleApostrophe = true; -+ meSetTextNumFormat = Never; -+} -+ - // ============================================================================- - - bool ScStringUtil::parseSimpleNumber( ---- sc/source/filter/inc/orcusfiltersimpl.hxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/filter/inc/orcusfiltersimpl.hxx 2013-06-24 19:08:23.000000000 -0400 -@@ -22,6 +22,8 @@ - - virtual bool importCSV(ScDocument& rDoc, const rtl::OUString& rPath) const; - virtual bool importGnumeric(ScDocument& rDoc, const rtl::OUString& rPath) const; -+ virtual bool importXLSX(ScDocument& rDoc, const rtl::OUString& rPath) const; -+ virtual bool importODS(ScDocument& rDoc, const rtl::OUString& rPath) const; - - virtual ScOrcusXMLContext* createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const; - }; ---- sc/source/filter/inc/orcusinterface.hxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/filter/inc/orcusinterface.hxx 2013-06-24 19:08:23.000000000 -0400 -@@ -21,13 +21,26 @@ - - class ScDocument; - class ScOrcusSheet; -+class ScOrcusFactory; - class ScRangeData; - -+class ScOrcusGlobalSettings : public orcus::spreadsheet::iface::import_global_settings -+{ -+ ScDocument& mrDoc; -+ -+public: -+ ScOrcusGlobalSettings(ScDocument& rDoc); -+ -+ virtual void set_origin_date(int year, int month, int day); -+}; -+ - class ScOrcusSharedStrings : public orcus::spreadsheet::iface::import_shared_strings - { -- std::vector maSharedStrings; -+ std::vector& mrStrings; - - public: -+ ScOrcusSharedStrings(std::vector& rStrings); -+ - virtual size_t append(const char* s, size_t n); - virtual size_t add(const char* s, size_t n); - -@@ -38,50 +51,49 @@ - virtual void append_segment(const char* s, size_t n); - - virtual size_t commit_segments(); -- -- const OUString& getByIndex(size_t index) const; --}; -- --class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory --{ -- ScDocument& mrDoc; -- boost::ptr_vector maSheets; -- ScOrcusSharedStrings maSharedStrings; -- --public: -- ScOrcusFactory(ScDocument& rDoc); -- -- virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length); -- virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length); -- virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings(); -- virtual orcus::spreadsheet::iface::import_styles* get_styles(); - }; - - class ScOrcusSheet : public orcus::spreadsheet::iface::import_sheet - { - ScDocument& mrDoc; - SCTAB mnTab; -- ScOrcusSharedStrings& mrSharedStrings; -+ ScOrcusFactory& mrFactory; - - typedef std::map SharedFormulaContainer; - SharedFormulaContainer maSharedFormulas; - public: -- ScOrcusSheet(ScDocument& rDoc, SCTAB nTab, ScOrcusSharedStrings& rSharedStrings); -+ ScOrcusSheet(ScDocument& rDoc, SCTAB nTab, ScOrcusFactory& rFactory); - - // Orcus import interface - virtual void set_auto(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); -+ virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); -+ virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value); -+ virtual void set_bool(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, bool value); -+ virtual void set_date_time( -+ orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, int year, int month, int day, int hour, int minute, double second); -+ - virtual void set_format(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t xf_index); -+ - virtual void set_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, const char* p, size_t n); - virtual void set_formula_result(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, const char* p, size_t n); -+ - virtual void set_shared_formula( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula); -+ - virtual void set_shared_formula( - orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, size_t sindex, - const char* p_formula, size_t n_formula, const char* p_range, size_t n_range); -+ - virtual void set_shared_formula(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); -- virtual void set_string(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, size_t sindex); -- virtual void set_value(orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, double value); -+ -+ virtual void set_array_formula( -+ orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, -+ const char* p, size_t n, orcus::spreadsheet::row_t array_rows, orcus::spreadsheet::col_t array_cols); -+ -+ virtual void set_array_formula( -+ orcus::spreadsheet::row_t row, orcus::spreadsheet::col_t col, orcus::spreadsheet::formula_grammar_t grammar, -+ const char* p, size_t n, const char* p_range, size_t n_range); - - SCTAB getIndex() const { return mnTab; } - }; -@@ -119,6 +131,10 @@ - virtual void set_cell_locked(bool b); - virtual size_t commit_cell_protection(); - -+ // number format -+ virtual void set_number_format(const char* s, size_t n); -+ virtual size_t commit_number_format(); -+ - // cell style xf - - virtual void set_cell_style_xf_count(size_t n); -@@ -147,5 +163,38 @@ - virtual size_t commit_cell_style(); - }; - -+class ScOrcusFactory : public orcus::spreadsheet::iface::import_factory -+{ -+ struct StringCellCache -+ { -+ ScAddress maPos; -+ size_t mnIndex; -+ -+ StringCellCache(const ScAddress& rPos, size_t nIndex); -+ }; -+ -+ typedef std::vector StringCellCaches; -+ -+ ScDocument& mrDoc; -+ std::vector maStrings; -+ StringCellCaches maStringCells; -+ ScOrcusGlobalSettings maGlobalSettings; -+ ScOrcusSharedStrings maSharedStrings; -+ boost::ptr_vector maSheets; -+ ScOrcusStyles maStyles; -+ -+public: -+ ScOrcusFactory(ScDocument& rDoc); -+ -+ virtual orcus::spreadsheet::iface::import_sheet* append_sheet(const char *sheet_name, size_t sheet_name_length); -+ virtual orcus::spreadsheet::iface::import_sheet* get_sheet(const char *sheet_name, size_t sheet_name_length); -+ virtual orcus::spreadsheet::iface::import_global_settings* get_global_settings(); -+ virtual orcus::spreadsheet::iface::import_shared_strings* get_shared_strings(); -+ virtual orcus::spreadsheet::iface::import_styles* get_styles(); -+ virtual void finalize(); -+ -+ void pushStringCell(const ScAddress& rPos, size_t nStrIndex); -+}; -+ - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ---- sc/source/filter/orcus/interface.cxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/filter/orcus/interface.cxx 2013-06-24 19:08:23.000000000 -0400 -@@ -13,14 +13,34 @@ - #include "cell.hxx" - #include "rangenam.hxx" - #include "tokenarray.hxx" --#include -+#include "stringutil.hxx" -+#include "docoptio.hxx" - -+#include "formula/token.hxx" -+#include "tools/datetime.hxx" -+ -+#define D_TIMEFACTOR 86400.0 - - using orcus::spreadsheet::row_t; - using orcus::spreadsheet::col_t; - using orcus::spreadsheet::formula_grammar_t; - --ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) : mrDoc(rDoc) {} -+ScOrcusGlobalSettings::ScOrcusGlobalSettings(ScDocument& rDoc) : mrDoc(rDoc) {} -+ -+void ScOrcusGlobalSettings::set_origin_date(int year, int month, int day) -+{ -+ ScDocOptions aOpt = mrDoc.GetDocOptions(); -+ aOpt.SetDate(year, month, day); -+ mrDoc.SetDocOptions(aOpt); -+} -+ -+ScOrcusFactory::StringCellCache::StringCellCache(const ScAddress& rPos, size_t nIndex) : -+ maPos(rPos), mnIndex(nIndex) {} -+ -+ScOrcusFactory::ScOrcusFactory(ScDocument& rDoc) : -+ mrDoc(rDoc), -+ maGlobalSettings(mrDoc), -+ maSharedStrings(maStrings) {} - - orcus::spreadsheet::iface::import_sheet* ScOrcusFactory::append_sheet(const char* sheet_name, size_t sheet_name_length) - { -@@ -29,7 +49,7 @@ - return NULL; - - SCTAB nTab = mrDoc.GetTableCount() - 1; -- maSheets.push_back(new ScOrcusSheet(mrDoc, nTab, maSharedStrings)); -+ maSheets.push_back(new ScOrcusSheet(mrDoc, nTab, *this)); - return &maSheets.back(); - } - -@@ -61,10 +81,15 @@ - return &(*it); - - // Create a new orcus sheet instance for this. -- maSheets.push_back(new ScOrcusSheet(mrDoc, nTab, maSharedStrings)); -+ maSheets.push_back(new ScOrcusSheet(mrDoc, nTab, *this)); - return &maSheets.back(); - } - -+orcus::spreadsheet::iface::import_global_settings* ScOrcusFactory::get_global_settings() -+{ -+ return &maGlobalSettings; -+} -+ - orcus::spreadsheet::iface::import_shared_strings* ScOrcusFactory::get_shared_strings() - { - return &maSharedStrings; -@@ -73,11 +98,31 @@ - orcus::spreadsheet::iface::import_styles* ScOrcusFactory::get_styles() - { - // We don't support it yet. -- return new ScOrcusStyles; -+ return &maStyles; - } - --ScOrcusSheet::ScOrcusSheet(ScDocument& rDoc, SCTAB nTab, ScOrcusSharedStrings& rSharedStrings) : -- mrDoc(rDoc), mnTab(nTab), mrSharedStrings(rSharedStrings) {} -+void ScOrcusFactory::finalize() -+{ -+ ScSetStringParam aParam; -+ aParam.setTextInput(); -+ StringCellCaches::const_iterator it = maStringCells.begin(), itEnd = maStringCells.end(); -+ for (; it != itEnd; ++it) -+ { -+ if (it->mnIndex >= maStrings.size()) -+ // String index out-of-bound! Something is up. -+ continue; -+ -+ mrDoc.SetString(it->maPos, maStrings[it->mnIndex], &aParam); -+ } -+} -+ -+void ScOrcusFactory::pushStringCell(const ScAddress& rPos, size_t nStrIndex) -+{ -+ maStringCells.push_back(StringCellCache(rPos, nStrIndex)); -+} -+ -+ScOrcusSheet::ScOrcusSheet(ScDocument& rDoc, SCTAB nTab, ScOrcusFactory& rFactory) : -+ mrDoc(rDoc), mnTab(nTab), mrFactory(rFactory) {} - - void ScOrcusSheet::set_auto(row_t row, col_t col, const char* p, size_t n) - { -@@ -85,6 +130,49 @@ - mrDoc.SetString(col, row, mnTab, aVal); - } - -+void ScOrcusSheet::set_string(row_t row, col_t col, size_t sindex) -+{ -+ // We need to defer string cells since the shared string pool is not yet -+ // populated at the time this method is called. Orcus imports string -+ // table after the cells get imported. We won't need to do this once we -+ // implement true shared strings in Calc core. -+ -+ mrFactory.pushStringCell(ScAddress(col, row, mnTab), sindex); -+} -+ -+void ScOrcusSheet::set_value(row_t row, col_t col, double value) -+{ -+ mrDoc.SetValue( col, row, mnTab, value ); -+} -+ -+void ScOrcusSheet::set_bool(row_t row, col_t col, bool value) -+{ -+ mrDoc.SetValue(col, row, mnTab, value ? 1.0 : 0.0); -+} -+ -+void ScOrcusSheet::set_date_time( -+ row_t row, col_t col, int year, int month, int day, int hour, int minute, double second) -+{ -+ SvNumberFormatter* pFormatter = mrDoc.GetFormatTable(); -+ -+ Date aDate(day, month, year); -+ sal_uIntPtr nSec = floor(second); -+ sal_uIntPtr nSec100 = (second - nSec) * 100; -+ Time aTime(hour, minute, nSec, nSec100); -+ Date aNullDate(*pFormatter->GetNullDate()); -+ long nDateDiff = aDate - aNullDate; -+ -+ double fTime = -+ static_cast(aTime.Get100Sec()) / 100.0 + -+ aTime.GetSec() + -+ aTime.GetMin() * 60.0 + -+ aTime.GetHour() * 3600.0; -+ -+ fTime /= D_TIMEFACTOR; -+ -+ mrDoc.SetValue(col, row, mnTab, nDateDiff + fTime); -+} -+ - void ScOrcusSheet::set_format(row_t /*row*/, col_t /*col*/, size_t /*xf_index*/) - { - } -@@ -191,45 +279,35 @@ - mrDoc.PutCell( col, row, mnTab, pCell ); - } - --void ScOrcusSheet::set_string(row_t row, col_t col, size_t sindex) -+void ScOrcusSheet::set_array_formula( -+ row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, -+ const char* /*p*/, size_t /*n*/, row_t /*array_rows*/, col_t /*array_cols*/) - { -- // Calc does not yet support shared strings so we have to -- // workaround by importing shared strings into a temporary -- // shared string container and writing into calc model as -- // normal string -- -- const OUString& rSharedString = mrSharedStrings.getByIndex(sindex); -- ScBaseCell* pCell = ScBaseCell::CreateTextCell( rSharedString, &mrDoc ); -- mrDoc.PutCell(col, row, mnTab, pCell); - } - --void ScOrcusSheet::set_value(row_t row, col_t col, double value) -+void ScOrcusSheet::set_array_formula( -+ row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, -+ const char* /*p*/, size_t /*n*/, const char* /*p_range*/, size_t /*n_range*/) - { -- mrDoc.SetValue( col, row, mnTab, value ); - } - -+ScOrcusSharedStrings::ScOrcusSharedStrings(std::vector& rStrings) : -+ mrStrings(rStrings) {} -+ - size_t ScOrcusSharedStrings::append(const char* s, size_t n) - { - OUString aNewString(s, n, RTL_TEXTENCODING_UTF8); -- maSharedStrings.push_back(aNewString); -+ mrStrings.push_back(aNewString); - -- return maSharedStrings.size() - 1; -+ return mrStrings.size() - 1; - } - - size_t ScOrcusSharedStrings::add(const char* s, size_t n) - { - OUString aNewString(s, n, RTL_TEXTENCODING_UTF8); -- maSharedStrings.push_back(aNewString); -- -- return maSharedStrings.size() - 1; --} -- --const OUString& ScOrcusSharedStrings::getByIndex(size_t nIndex) const --{ -- if(nIndex < maSharedStrings.size()) -- return maSharedStrings[nIndex]; -+ mrStrings.push_back(aNewString); - -- throw std::exception(); -+ return mrStrings.size() - 1; - } - - void ScOrcusSharedStrings::set_segment_bold(bool /*b*/) -@@ -341,6 +419,14 @@ - return 0; - } - -+void ScOrcusStyles::set_number_format(const char* /*s*/, size_t /*n*/) -+{ -+} -+ -+size_t ScOrcusStyles::commit_number_format() -+{ -+ return 0; -+} - - // cell style xf - ---- sc/source/filter/orcus/orcusfiltersimpl.cxx 2013-06-11 05:33:38.000000000 -0400 -+++ sc/source/filter/orcus/orcusfiltersimpl.cxx 2013-06-24 19:08:23.000000000 -0400 -@@ -17,6 +17,8 @@ - #include - #include - #include -+#include -+#include - #include - - #ifdef WNT -@@ -71,6 +73,46 @@ - return true; - } - -+bool ScOrcusFiltersImpl::importXLSX(ScDocument& rDoc, const rtl::OUString& rPath) const -+{ -+ ScOrcusFactory aFactory(rDoc); -+ OString aSysPath = toSystemPath(rPath); -+ const char* path = aSysPath.getStr(); -+ -+ try -+ { -+ orcus::orcus_xlsx filter(&aFactory); -+ filter.read_file(path); -+ } -+ catch (const std::exception& e) -+ { -+ SAL_WARN("sc", "Unable to load xlsx file! " << e.what()); -+ return false; -+ } -+ -+ return true; -+} -+ -+bool ScOrcusFiltersImpl::importODS(ScDocument& rDoc, const rtl::OUString& rPath) const -+{ -+ ScOrcusFactory aFactory(rDoc); -+ OString aSysPath = toSystemPath(rPath); -+ const char* path = aSysPath.getStr(); -+ -+ try -+ { -+ orcus::orcus_ods filter(&aFactory); -+ filter.read_file(path); -+ } -+ catch (const std::exception& e) -+ { -+ SAL_WARN("sc", "Unable to load ods file! " << e.what()); -+ return false; -+ } -+ -+ return true; -+} -+ - ScOrcusXMLContext* ScOrcusFiltersImpl::createXMLContext(ScDocument& rDoc, const rtl::OUString& rPath) const - { - return new ScOrcusXMLContextImpl(rDoc, rPath); diff -Nur libreoffice/files/patch-mdds-0.9.x.orig libreoffice/files/patch-mdds-0.9.x --- libreoffice/files/patch-mdds-0.9.x.orig 2013-09-18 12:45:46.606776840 +0900 +++ libreoffice/files/patch-mdds-0.9.x 2014-01-30 09:44:12.966797548 +0900 @@ -1,27 +1,21 @@ ---- sc/source/core/data/dpfilteredcache.cxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sc/source/core/data/dpfilteredcache.cxx 2013-08-16 18:29:17.000000000 -0400 -@@ -185,7 +185,7 @@ - { - if (nRow > nEndSegment) - { -- if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment)) -+ if (!maShowByFilter.search_tree(nRow, bShow, NULL, &nEndSegment).second) - { - OSL_FAIL("Tree search failed!"); - continue; ---- sc/source/core/data/segmenttree.cxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sc/source/core/data/segmenttree.cxx 2013-08-16 18:29:17.000000000 -0400 -@@ -159,7 +159,7 @@ - if (!maSegments.is_tree_valid()) - maSegments.build_tree(); +--- sc/inc/mtvelements.hxx.org 2013-07-25 21:25:20.837766596 +0200 ++++ sc/inc/mtvelements.hxx 2013-07-25 21:26:32.853493134 +0200 +@@ -63,11 +63,11 @@ + namespace sc { + + // Broadcaster storage container +-typedef mdds::mtv::custom_block_func1 BCBlkFunc; ++typedef mdds::mtv::custom_block_func1 BCBlkFunc; + typedef mdds::multi_type_vector BroadcasterStoreType; -- if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2)) -+ if (!maSegments.search_tree(nPos, nValue, &nPos1, &nPos2).second) - return false; + // Cell text attribute container. +-typedef mdds::mtv::custom_block_func1 CTAttrFunc; ++typedef mdds::mtv::custom_block_func1 CTAttrFunc; + typedef mdds::multi_type_vector CellTextAttrStoreType; - rData.mnPos1 = nPos1; ---- sc/source/core/tool/scmatrix.cxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sc/source/core/tool/scmatrix.cxx 2013-09-16 12:27:09.000000000 -0400 + /** +--- sc/source/core/tool/scmatrix.cxx.org 2013-07-25 21:26:36.733621612 +0200 ++++ sc/source/core/tool/scmatrix.cxx 2013-07-25 21:27:08.784683394 +0200 @@ -89,7 +89,7 @@ } } @@ -31,34 +25,3 @@ { if (!p) return; ---- sc/source/filter/excel/colrowst.cxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sc/source/filter/excel/colrowst.cxx 2013-08-16 18:29:17.000000000 -0400 -@@ -208,7 +208,7 @@ - if (GetColFlag(nCol, EXC_COLROW_USED)) - { - sal_uInt16 nTmp; -- if (maColWidths.search_tree(nCol, nTmp)) -+ if (maColWidths.search_tree(nCol, nTmp).second) - nWidth = nTmp; - } - -@@ -258,7 +258,7 @@ - for (SCROW i = nPrevRow; i <= nRow - 1; ++i) - { - SCROW nLast; -- if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast)) -+ if (!maRowHeights.search_tree(i, nHeight, NULL, &nLast).second) - { - // search failed for some reason - return; ---- sc/source/filter/xml/XMLStylesExportHelper.cxx.orig 2013-08-13 16:11:48.000000000 -0400 -+++ sc/source/filter/xml/XMLStylesExportHelper.cxx 2013-08-16 18:29:17.000000000 -0400 -@@ -1290,7 +1290,7 @@ - r.build_tree(); - sal_Int32 nStyle; - sal_Int32 nStart, nEnd; -- if (r.search_tree(nField, nStyle, &nStart, &nEnd)) -+ if (r.search_tree(nField, nStyle, &nStart, &nEnd).second) - { - // Cache this value for better performance. - maCache.mnTable = nTable; diff -Nur libreoffice/files/patch-odk__pack__gendocu__makefile.mk.orig libreoffice/files/patch-odk__pack__gendocu__makefile.mk --- libreoffice/files/patch-odk__pack__gendocu__makefile.mk.orig 2013-03-09 19:39:58.823214335 +0900 +++ libreoffice/files/patch-odk__pack__gendocu__makefile.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- ./odk/pack/gendocu/makefile.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./odk/pack/gendocu/makefile.mk 2013-02-18 18:38:29.000000000 -0500 -@@ -97,7 +97,7 @@ - $(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f) - -$(MKDIRHIER) $(@:d) - $(MY_COPY) $< $@ -- cd $(JAVA_SRC_DIR) && unzip -quo $(@:f) -+ cd $(JAVA_SRC_DIR) && unzip -qu $(@:f) - - #$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/%.java : $(PRJ)$/source$/bean$/com$/sun$/star$/beans$/%.java - # -$(MKDIRHIER) $(@:d) diff -Nur libreoffice/files/patch-sd__Module_sd.mk.orig libreoffice/files/patch-sd__Module_sd.mk --- libreoffice/files/patch-sd__Module_sd.mk.orig 2013-04-17 09:16:58.686542484 +0900 +++ libreoffice/files/patch-sd__Module_sd.mk 2014-01-29 17:01:38.000000000 +0900 @@ -1,10 +1,10 @@ ---- ./sd/Module_sd.mk.orig 2013-03-12 07:00:34.000000000 -0400 -+++ ./sd/Module_sd.mk 2013-03-20 16:36:08.000000000 -0400 -@@ -44,7 +44,6 @@ +--- sd/Module_sd.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ sd/Module_sd.mk 2014-01-29 17:01:07.000000000 +0900 +@@ -24,7 +24,6 @@ ifneq ($(OS),DRAGONFLY) $(eval $(call gb_Module_add_check_targets,sd,\ - CppunitTest_sd_uimpress \ - CppunitTest_sd_regression_test \ + CppunitTest_sd_import_tests \ CppunitTest_sd_filters_test \ )) diff -Nur libreoffice/files/patch-solenv__gbuild__Deliver.mk.orig libreoffice/files/patch-solenv__gbuild__Deliver.mk --- libreoffice/files/patch-solenv__gbuild__Deliver.mk.orig 2013-05-10 07:18:22.015223317 +0900 +++ libreoffice/files/patch-solenv__gbuild__Deliver.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- solenv/gbuild/Deliver.mk.orig 2013-05-02 11:55:29.000000000 -0400 -+++ solenv/gbuild/Deliver.mk 2013-05-08 17:43:53.000000000 -0400 -@@ -60,7 +60,7 @@ - endef - - define gb_Deliver__deliver --$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2) -+$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) && touch $(if $(filter-out FREEBSD NETBSD OPENBSD DRAGONFLY MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2) - endef - - ifneq ($(strip $(gb_Deliver_GNUCOPY)),) diff -Nur libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk.orig libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk --- libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk.orig 2013-03-09 19:39:58.820214431 +0900 +++ libreoffice/files/patch-solenv__gbuild__platform__unxgcc.mk 2014-01-29 17:09:54.000000000 +0900 @@ -1,11 +1,11 @@ ---- ./solenv/gbuild/platform/unxgcc.mk.orig 2013-02-19 19:39:23.000000000 -0500 -+++ ./solenv/gbuild/platform/unxgcc.mk 2013-02-19 19:35:41.000000000 -0500 -@@ -53,7 +53,7 @@ +--- solenv/gbuild/platform/unxgcc.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ solenv/gbuild/platform/unxgcc.mk 2014-01-29 17:09:01.000000000 +0900 +@@ -48,7 +48,7 @@ gb_CXXFLAGS := \ $(gb_CXXFLAGS_COMMON) \ -fPIC \ - -Wshadow \ + -Wno-unused-parameter \ - -Wsign-promo \ -Woverloaded-virtual \ + ifneq ($(COM_GCC_IS_CLANG),TRUE) diff -Nur libreoffice/files/patch-sw__Module_sw.mk.orig libreoffice/files/patch-sw__Module_sw.mk --- libreoffice/files/patch-sw__Module_sw.mk.orig 2013-04-17 09:16:58.687542387 +0900 +++ libreoffice/files/patch-sw__Module_sw.mk 2014-01-29 17:13:07.000000000 +0900 @@ -1,16 +1,17 @@ ---- ./sw/Module_sw.mk.orig 2013-03-12 07:00:34.000000000 -0400 -+++ ./sw/Module_sw.mk 2013-03-21 13:32:32.000000000 -0400 -@@ -37,13 +37,7 @@ +--- sw/Module_sw.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ sw/Module_sw.mk 2014-01-29 17:12:45.000000000 +0900 +@@ -41,14 +41,8 @@ endif -$(eval $(call gb_Module_add_check_targets,sw,\ -- CppunitTest_sw_swdoc_test \ +- CppunitTest_sw_uwriter \ -)) - $(eval $(call gb_Module_add_slowcheck_targets,sw,\ + CppunitTest_sw_htmlexport \ - CppunitTest_sw_macros_test \ -- CppunitTest_sw_subsequent_ooxmlexport \ - CppunitTest_sw_subsequent_ooxmlimport \ - CppunitTest_sw_subsequent_ww8export \ - CppunitTest_sw_subsequent_ww8import \ +- CppunitTest_sw_ooxmlexport \ + CppunitTest_sw_ooxmlimport \ + CppunitTest_sw_ww8export \ + CppunitTest_sw_ww8import \ diff -Nur libreoffice/files/patch-sysui__CustomTarget_slackware.mk libreoffice/files/patch-sysui__CustomTarget_slackware.mk --- libreoffice/files/patch-sysui__CustomTarget_slackware.mk 1970-01-01 09:00:00.000000000 +0900 +++ libreoffice/files/patch-sysui__CustomTarget_slackware.mk 2014-01-29 18:04:41.000000000 +0900 @@ -0,0 +1,11 @@ +--- sysui/CustomTarget_slackware.mk.orig 2013-12-11 01:11:21.000000000 +0900 ++++ sysui/CustomTarget_slackware.mk 2014-01-29 18:04:10.000000000 +0900 +@@ -55,7 +55,7 @@ + ./create_tree.sh + cp $(slack_WORKDIR)/empty.tar $@.tmp + $(GNUTAR) -C $(slack_WORKDIR)/$* --owner=root $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--group=root) --same-owner \ +- -rf $@.tmp install usr opt ++ -rf $@.tmp install opt + gzip < $@.tmp > $@ + + # vim: set noet sw=4 ts=4: diff -Nur libreoffice/files/patch-sysui__desktop__share__create_tree.sh.orig libreoffice/files/patch-sysui__desktop__share__create_tree.sh --- libreoffice/files/patch-sysui__desktop__share__create_tree.sh.orig 2014-01-23 07:05:09.267634086 +0900 +++ libreoffice/files/patch-sysui__desktop__share__create_tree.sh 2014-01-30 10:33:23.409594352 +0900 @@ -1,11 +1,11 @@ ---- ./sysui/desktop/share/create_tree.sh.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./sysui/desktop/share/create_tree.sh 2013-02-18 18:46:30.000000000 -0500 -@@ -60,32 +60,32 @@ +--- sysui/desktop/share/create_tree.sh.orig 2013-12-11 01:11:21.000000000 +0900 ++++ sysui/desktop/share/create_tree.sh 2014-01-29 17:16:09.000000000 +0900 +@@ -57,32 +57,32 @@ chmod 0644 "${DESTDIR}/${GNOMEDIR}/share/application-registry/${PREFIX}".* fi -mkdir -p "${DESTDIR}/usr/bin" -+mkdir -p "${DESTDIR}/${PREFIXSDIR}/bin" ++mkdir -p "${DESTDIR}/${PREFIXDIR}/bin" test -n "${OFFICE_PREFIX}" && office_prefix="${OFFICE_PREFIX}" || office_prefix=/opt office_root=${office_prefix}/${PREFIX} @@ -19,7 +19,7 @@ +cp printeradmin.sh "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}-printeradmin" +chmod 0755 "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}-printeradmin" - if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != lodev${PRODUCTVERSION} ; then + if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" @@ -29,7 +29,7 @@ + ln -sf /${PREFIXDIR}/bin/${PREFIX}-printeradmin "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}-printeradmin" fi - test "${PREFIX}" = lodev${PRODUCTVERSION} && mime_def_file="lodev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" + test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" -mkdir -p "${DESTDIR}/usr/share/mime/packages" -cp openoffice.org.xml "${DESTDIR}/usr/share/mime/packages/$mime_def_file" -chmod 0644 "${DESTDIR}/usr/share/mime/packages/$mime_def_file" diff -Nur libreoffice/files/patch-testtools__Module_testtools.mk.orig libreoffice/files/patch-testtools__Module_testtools.mk --- libreoffice/files/patch-testtools__Module_testtools.mk.orig 2013-03-09 19:39:58.814213307 +0900 +++ libreoffice/files/patch-testtools__Module_testtools.mk 1970-01-01 09:00:00.000000000 +0900 @@ -1,17 +0,0 @@ ---- ./testtools/Module_testtools.mk.orig 2013-01-31 05:54:53.000000000 -0500 -+++ ./testtools/Module_testtools.mk 2013-02-22 14:30:43.000000000 -0500 -@@ -55,14 +55,6 @@ - #)) - #endif - --# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge. --# (is it still relevant?) --ifneq ($(COM)$(OS)$(CPU),GCCMACOSXP) --$(eval $(call gb_Module_add_check_targets,testtools,\ -- CustomTarget_uno_test \ --)) --endif -- - endif - - # vim:set shiftwidth=4 softtabstop=4 expandtab: Files libreoffice/ports-libreoofice-4.1.4.tar.xz and libreoffice/ports-libreoofice-4.1.4.tar.xz differ